From ab1e92860bdc5388621e8314b8e1652590fa2b05 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 3 Jun 2018 01:31:17 -0400 Subject: makepkg: fix the --nocolor option being broken when passed to pacman -U In commit 8ff03868a37b1f9c447784ae2fd639a49e426399 PACMAN_OPTS was turned into an array. Unfortunately, that array was generated by treating the "--color never" option as one string, instead of an array of two strings... Fixes FS#58820 Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 14f81692..43ccb121 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1265,7 +1265,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