Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4d898e342f0ff31bd6f9db80523d37cccb3243b9
commit 4d898e342f0ff31bd6f9db80523d37cccb3243b9 Author: Melko <[email protected]> Date: Sat Jun 9 21:13:57 2012 +0200 include/util.sh * revert 6c12af2 so we have wildcards again * some cosmetic changes diff --git a/source/include/util.sh b/source/include/util.sh index cf874f1..65b31c3 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -333,7 +333,7 @@ Frm() { local i for i in "$@"; do Fmessage "Deleting file(s): $i" - rm -rf "$Fdestdir"/"$i" || Fdie + rm -rf "$Fdestdir/"$i || Fdie done } @@ -346,9 +346,9 @@ Fcp() { if [ -e "$Fdestdir/"$1 ]; then # Compatibility warning "Deprecated usage of $*" - cp "$Fdestdir/"$1 "$Fdestdir"/$2 || Fdie + cp "$Fdestdir/"$1 "$Fdestdir/"$2 || Fdie else - cp -a "$Fsrcdir/"$1 "$Fdestdir"/$2 || Fdie + cp -a "$Fsrcdir/"$1 "$Fdestdir/"$2 || Fdie fi } @@ -359,7 +359,7 @@ Fcp() { Fcpr() { Fmessage "Copying file(s) recursive: $1" warning "Fcpr is deprecated in favor of Fcp" - cp -a "$Fsrcdir/"$1 "$Fdestdir"/$2 || Fdie + cp -a "$Fsrcdir/"$1 "$Fdestdir/"$2 || Fdie } ### @@ -369,7 +369,7 @@ Fcpr() { ### Fcprel() { Fmessage "Copying file(s): $1" - cp -a $1 "$Fdestdir"/$2 || Fdie + cp -a $1 "$Fdestdir/"$2 || Fdie } ### @@ -380,7 +380,7 @@ Fcprel() { Fcprrel() { Fmessage "Copying file(s) recursive: $1" warning "Fcprrel is deprecated in favor of Fcprel" - cp -a $1 "$Fdestdir"/$2 || Fdie + cp -a $1 "$Fdestdir/"$2 || Fdie } ### @@ -400,7 +400,7 @@ Fsubmv() local destdir="`Fsubdestdir "$1"`" i info="`Fsubdestdirinfo "$1"`" Fmessage "Moving file(s)$info:" msg2 "$2 -> $3" - for i in "$destdir"/$2 # expand $2 if possible + for i in "$destdir/"$2 # expand $2 if possible do if [ ! -e "$i" -a ! -h "$i" ]; then # expand failed ? Fmessage "No such file $2$info!! Typo? ($i)" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
