Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=47ae28885ca79871ccca2ae4af1a5081d076e914
commit 47ae28885ca79871ccca2ae4af1a5081d076e914 Author: Michel Hermier <[email protected]> Date: Sun Mar 16 16:57:31 2014 +0100 makepkg: No need to subshell in makepkg_env, call makepkg env instead of makepkg_env. diff --git a/scripts/makepkg b/scripts/makepkg index 2f2072b..8cc11f0 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -395,7 +395,6 @@ makepkg_env_usage() { } makepkg_env() { - ( # Protect environment with a subshell local _interactive=0 _options_consumed while [ $# -gt 0 ]; do @@ -462,7 +461,6 @@ makepkg_env() { '!') ! "${@:2}" ;; *) "$@" ;; esac - ) return $? } _makepkg_commands[env]=makepkg_env @@ -558,7 +556,7 @@ makepkg_lock() { fi unset _parents _options_consumed - makepkg_env "${@:2}" + makepkg env "${@:2}" local _ret=$? _makepkg_unlock_files "$1" return $_ret @@ -673,7 +671,7 @@ makepkg_mount() { return 1 fi unset _mount_args _options_consumed - makepkg_env "${@:3}" + makepkg env "${@:3}" local _ret=$? if ! umount "$2"; then error "Failed to umount $2" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
