From 361bd76f7e26e2c4a78aebc79b8309f5c7771518 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jul 2010 17:49:52 +0000
Subject: [PATCH] scripts/env: fix initialization of files/ when creating a new
environment (patch from #7603)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22336 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
scripts/env | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/env b/scripts/env
index 65594f9a5..882b42a49 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
--
2.20.1