path expansion was broken due to a badly quoted *
authorJohn Crispin <john@openwrt.org>
Fri, 1 Apr 2011 11:07:27 +0000 (11:07 +0000)
committerJohn Crispin <john@openwrt.org>
Fri, 1 Apr 2011 11:07:27 +0000 (11:07 +0000)
Signed-of-by: Benjamin Cama <benoar@dolka.fr>
SVN-Revision: 26391

scripts/env

index 882b42a..ebfbb70 100755 (executable)
@@ -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