From 6b929e268734f6a212aab2f0f470684e82f3d24b Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 19 Nov 2011 17:15:50 +0000
Subject: [PATCH] scripts/env: make mv and cp operations more robust (treat
dotfiles appropriately) (based on patch by Rolf Leggewie)
SVN-Revision: 29261
---
scripts/env | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/env b/scripts/env
index c9eab5dfab..ebd2dac38e 100755
--- 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
--
GitLab