From: John Crispin <john@openwrt.org>
Date: Fri, 1 Apr 2011 11:07:27 +0000 (+0000)
Subject: path expansion was broken due to a badly quoted *
X-Git-Tag: v19.07.0-rc1~27726
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e42e2b3e9cf470dd2c8da497a8a87500f5451a53;p=openwrt%2Fstaging%2Fhauke.git

path expansion was broken due to a badly quoted *

Signed-of-by: Benjamin Cama <benoar@dolka.fr>

SVN-Revision: 26391
---

diff --git a/scripts/env b/scripts/env
index 882b42a49a..ebfbb70c5c 100755
--- a/scripts/env
+++ b/scripts/env
@@ -138,7 +138,7 @@ env_clear() {
 	env_sync_data
 	if ask_bool 1 "Do you want to keep your current config and files"; then
 		mkdir -p "$BASEDIR/files"
-		cp -a "$ENVDIR/files/*" "$BASEDIR/files" 2>/dev/null >/dev/null
+		cp -a "$ENVDIR/files/"* "$BASEDIR/files" 2>/dev/null >/dev/null
 		cp "$ENVDIR/.config" "$BASEDIR/"
 	else
 		rm -rf "$BASEDIR/files" "$BASEDIR/.config"
@@ -193,7 +193,7 @@ 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"
-				mv "$BASEDIR/files/*" "$ENVDIR/files/" 2>/dev/null
+				mv "$BASEDIR/files/"* "$ENVDIR/files/" 2>/dev/null
 				rmdir "$BASEDIR/files"
 			}
 			env_sync