From 8ff03868a37b1f9c447784ae2fd639a49e426399 Mon Sep 17 00:00:00 2001 From: Xyne Date: Sat, 20 Feb 2016 16:02:31 +1000 Subject: makepkg: Turn PACMAN_OPTS into an array Avoid potential word expansion with future inclusions Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/makepkg.sh.in') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5b4811f1..2efcc985 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -87,7 +87,7 @@ SPLITPKG=0 SOURCEONLY=0 VERIFYSOURCE=0 -PACMAN_OPTS= +PACMAN_OPTS=() shopt -s extglob @@ -219,7 +219,7 @@ source_has_signatures() { run_pacman() { local cmd if [[ $1 != -@(T|Qq) ]]; then - cmd=("$PACMAN_PATH" $PACMAN_OPTS "$@") + cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@") else cmd=("$PACMAN_PATH" "$@") fi @@ -1780,8 +1780,8 @@ while true; do # Pacman Options --asdeps) ASDEPS=1;; --needed) NEEDED=1;; - --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; - --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; + --noconfirm) PACMAN_OPTS+=("--noconfirm") ;; + --noprogressbar) PACMAN_OPTS+=("--noprogressbar") ;; # Makepkg Options --allsource) SOURCEONLY=2 ;; @@ -1800,7 +1800,7 @@ while true; do -i|--install) INSTALL=1 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; - -m|--nocolor) USE_COLOR='n'; PACMAN_OPTS+=" --color never" ;; + -m|--nocolor) USE_COLOR='n'; PACMAN_OPTS+=("--color never") ;; --noarchive) NOARCHIVE=1 ;; --nocheck) RUN_CHECK='n' ;; --noprepare) RUN_PREPARE='n' ;; -- cgit v1.2.3-70-g09d2