From 5dba542b5a0bb42c097d1cd81913ac98abaa14b3 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jul 2010 17:50:18 +0000
Subject: [PATCH] backport scripts/env init fix from r22336

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22337 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