From 2759bfac85a8a30d9c41cae1f4016c0eaaf416b3 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
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)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29261 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 scripts/env | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/env b/scripts/env
index c9eab5dfa..ebd2dac38 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
-- 
2.20.1