scripts/env: make mv and cp operations more robust (treat dotfiles appropriately...

SVN-Revision: 29261

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