Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4667ee1dd98068c0533779a81bd95ff82ab1c0d0
commit 4667ee1dd98068c0533779a81bd95ff82ab1c0d0
Author: Michel Hermier <herm...@frugalware.org>
Date: Wed Nov 6 10:33:44 2013 +0100
makepkg: Reorder makepkg_env a little.
diff --git a/scripts/makepkg b/scripts/makepkg
index 7e1b38f..0f8ca9d 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -435,7 +435,6 @@ makepkg_env() {
return 1
fi
done
- unset _options_consumed
while [ $# -gt 0 ]; do
case "$1" in
# special options
@@ -447,15 +446,15 @@ makepkg_env() {
esac
shift
done
-
if [ $# -eq 0 ]; then
- env
- else
- case "$1" in
- '!') ! "${@:2}" ;;
- *) "$@" ;;
- esac
+ set -- env
fi
+ unset _options_consumed
+
+ case "$1" in
+ '!') ! "${@:2}" ;;
+ *) "$@" ;;
+ esac
)
return $?
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
