aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2011-04-01 11:07:27 +0000
committerJohn Crispin <blogic@openwrt.org>2011-04-01 11:07:27 +0000
commit4cde95913b4b81ea0ca294400c4a65fe52b864cc (patch)
tree8007a36d4b16626377f294b3185636b437d8b8a3 /scripts
parent46cdebb9ec0f3b8c216c1fa005cf811a3a5a1842 (diff)
downloadupstream-4cde95913b4b81ea0ca294400c4a65fe52b864cc.tar.gz
upstream-4cde95913b4b81ea0ca294400c4a65fe52b864cc.tar.bz2
upstream-4cde95913b4b81ea0ca294400c4a65fe52b864cc.zip
[scripts/env]
path expansion was broken due to a badly quoted * Signed-of-by: Benjamin Cama <benoar@dolka.fr> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26391 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/env4
1 files changed, 2 insertions, 2 deletions
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