aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-19 17:15:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-19 17:15:50 +0000
commite9d65e1e2bad016ef9fc69ee378cfe3a71299af3 (patch)
tree34a556a88a5fb1b4815940e6e6827afebbd62acd /scripts
parenteeba5feb8df97e23d75c808b6a3ce7aca167a7ba (diff)
downloadupstream-e9d65e1e2bad016ef9fc69ee378cfe3a71299af3.tar.gz
upstream-e9d65e1e2bad016ef9fc69ee378cfe3a71299af3.tar.bz2
upstream-e9d65e1e2bad016ef9fc69ee378cfe3a71299af3.zip
scripts/env: make mv and cp operations more robust (treat dotfiles appropriately) (based on patch by Rolf Leggewie)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29261 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/env4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/env b/scripts/env
index c9eab5dfab..ebd2dac38e 100755
--- a/scripts/env
+++ b/scripts/env
@@ -138,7 +138,9 @@ env_clear() {
env_sync_data
if ask_bool 1 "Do you want to keep your current config and files"; then
mkdir -p "$BASEDIR/files"
+ shopt -s dotglob
cp -a "$ENVDIR/files/"* "$BASEDIR/files" 2>/dev/null >/dev/null
+ shopt -u dotglob
cp "$ENVDIR/.config" "$BASEDIR/"
else
rm -rf "$BASEDIR/files" "$BASEDIR/.config"
@@ -193,7 +195,9 @@ env_new() {
if ask_bool 1 "Do you want to keep your current config and files?"; then
[ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && {
mkdir -p "$ENVDIR/files"
+ shopt -s dotglob
mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null
+ shopt -u dotglob
rmdir "$BASEDIR/files"
}
env_sync