mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
makepkg: avoid use of eval in run_pacman
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
This commit is contained in:
parent
708a227578
commit
8d26df5ee5
@ -415,18 +415,18 @@ download_file() {
|
|||||||
run_pacman() {
|
run_pacman() {
|
||||||
local cmd
|
local cmd
|
||||||
if [[ ! $1 = -@(T|Qq) ]]; then
|
if [[ ! $1 = -@(T|Qq) ]]; then
|
||||||
printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
|
cmd=("$PACMAN" $PACMAN_OPTS "$@")
|
||||||
else
|
else
|
||||||
printf -v cmd "%q " "$PACMAN" "$@"
|
cmd=("$PACMAN" "$@")
|
||||||
fi
|
fi
|
||||||
if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then
|
if (( ! ASROOT )) && [[ ! $1 = -@(T|Qq) ]]; then
|
||||||
if type -p sudo >/dev/null; then
|
if type -p sudo >/dev/null; then
|
||||||
cmd="sudo $cmd"
|
cmd=(sudo "${cmd[@]}")
|
||||||
else
|
else
|
||||||
cmd="su root -c '$cmd'"
|
cmd=(su root -c "$(printf '%q ' "${cmd[@]}")")
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
eval "$cmd"
|
"${cmd[@]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
check_deps() {
|
check_deps() {
|
||||||
|
Loading…
Reference in New Issue
Block a user