aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-07-21 17:49:52 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-07-21 17:49:52 +0000
commit0e1337ea477cefd169447d66c036d518d1f53ee1 (patch)
tree59f5bd041d4a2e43d996b3e425764574a2210319 /scripts
parent67b4181c8af8b117a846a196302b15bb0c0be7d3 (diff)
downloadupstream-0e1337ea477cefd169447d66c036d518d1f53ee1.tar.gz
upstream-0e1337ea477cefd169447d66c036d518d1f53ee1.tar.bz2
upstream-0e1337ea477cefd169447d66c036d518d1f53ee1.zip
scripts/env: fix initialization of files/ when creating a new environment (patch from #7603)
SVN-Revision: 22336
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/env3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/env b/scripts/env
index 65594f9a5d..882b42a49a 100755
--- a/scripts/env
+++ b/scripts/env
@@ -192,7 +192,8 @@ env_new() {
if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then
if ask_bool 1 "Do you want to keep your current config and files?"; then
[ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && {
- mv "$BASEDIR/files/"* "$ENVDIR/" 2>/dev/null
+ mkdir -p "$ENVDIR/files"
+ mv "$BASEDIR/files/*" "$ENVDIR/files/" 2>/dev/null
rmdir "$BASEDIR/files"
}
env_sync