Commit 8ff03868 authored by Xyne's avatar Xyne Committed by Allan McRae
Browse files

makepkg: Turn PACMAN_OPTS into an array



Avoid potential word expansion with future inclusions

Signed-off-by: Allan McRae's avatarAllan McRae <allan@archlinux.org>
parent 1a29744d
...@@ -87,7 +87,7 @@ SPLITPKG=0 ...@@ -87,7 +87,7 @@ SPLITPKG=0
SOURCEONLY=0 SOURCEONLY=0
VERIFYSOURCE=0 VERIFYSOURCE=0
PACMAN_OPTS= PACMAN_OPTS=()
shopt -s extglob shopt -s extglob
...@@ -219,7 +219,7 @@ source_has_signatures() { ...@@ -219,7 +219,7 @@ source_has_signatures() {
run_pacman() { run_pacman() {
local cmd local cmd
if [[ $1 != -@(T|Qq) ]]; then if [[ $1 != -@(T|Qq) ]]; then
cmd=("$PACMAN_PATH" $PACMAN_OPTS "$@") cmd=("$PACMAN_PATH" "${PACMAN_OPTS[@]}" "$@")
else else
cmd=("$PACMAN_PATH" "$@") cmd=("$PACMAN_PATH" "$@")
fi fi
...@@ -1780,8 +1780,8 @@ while true; do ...@@ -1780,8 +1780,8 @@ while true; do
# Pacman Options # Pacman Options
--asdeps) ASDEPS=1;; --asdeps) ASDEPS=1;;
--needed) NEEDED=1;; --needed) NEEDED=1;;
--noconfirm) PACMAN_OPTS+=" --noconfirm" ;; --noconfirm) PACMAN_OPTS+=("--noconfirm") ;;
--noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; --noprogressbar) PACMAN_OPTS+=("--noprogressbar") ;;
# Makepkg Options # Makepkg Options
--allsource) SOURCEONLY=2 ;; --allsource) SOURCEONLY=2 ;;
...@@ -1800,7 +1800,7 @@ while true; do ...@@ -1800,7 +1800,7 @@ while true; do
-i|--install) INSTALL=1 ;; -i|--install) INSTALL=1 ;;
--key) shift; GPGKEY=$1 ;; --key) shift; GPGKEY=$1 ;;
-L|--log) LOGGING=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 ;; --noarchive) NOARCHIVE=1 ;;
--nocheck) RUN_CHECK='n' ;; --nocheck) RUN_CHECK='n' ;;
--noprepare) RUN_PREPARE='n' ;; --noprepare) RUN_PREPARE='n' ;;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment