bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: fix quoting in calls to check_deps

Browse source 
The inside needs quoting, and this is separate from the declartion,
which does not (in these cases).
This commit is contained in:
Dave Reisner 2014-12-22 20:20:02 -05:00 • committed by Allan McRae
parent 9ce2c9b187
commit 90f1dd1657
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/makepkg.sh.in
View file

@ -276,12 +276,12 @@ resolve_deps() {
# deplist cannot be declared like this: local deplist=$(foo) # deplist cannot be declared like this: local deplist=$(foo)
# Otherwise, the return value will depend on the assignment. # Otherwise, the return value will depend on the assignment.
local deplist local deplist
deplist="$(check_deps $*)" || exit 1 deplist=$(check_deps "$@") || exit 1
[[ -z $deplist ]] && return $R_DEPS_SATISFIED [[ -z $deplist ]] && return $R_DEPS_SATISFIED
if handle_deps $deplist; then if handle_deps $deplist; then
# check deps again to make sure they were resolved # check deps again to make sure they were resolved
deplist="$(check_deps $*)" || exit 1 deplist=$(check_deps "$@") || exit 1
[[ -z $deplist ]] && return $R_DEPS_SATISFIED [[ -z $deplist ]] && return $R_DEPS_SATISFIED
fi fi
@ -962,7 +962,7 @@ check_vcs_software() {
client=$(get_vcsclient "$proto") || exit $? client=$(get_vcsclient "$proto") || exit $?
# ensure specified program is installed # ensure specified program is installed
local uninstalled local uninstalled
uninstalled="$(check_deps $client)" || exit 1 uninstalled=$(check_deps "$client") || exit 1
# if not installed, check presence in depends or makedepends # if not installed, check presence in depends or makedepends
if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then
if ! in_array "$client" ${all_deps[@]}; then if ! in_array "$client" ${all_deps[@]}; then