backport scripts/env init fix from r22336

[openwrt-10.03/.git] / scripts / env

diff --git a/scripts/env b/scripts/env
index 65594f9a5d04b74f7372bf65ed699615426a817a..882b42a49ae44767ae78501dfa31145a48657c8e 100755 (executable)
--- 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