mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:34:36 +02:00
[scripts/env]
path expansion was broken due to a badly quoted * Signed-of-by: Benjamin Cama <benoar@dolka.fr> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26391 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
d779c21114
commit
70df49d541
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user