[gentoo-dev] [PATCH 2/6] virtualx.eclass: Pass xvfbargs as an array

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@g.o>
---
 eclass/virtualx.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 5c4b39164cff..d7b82e12cdd5 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -109,7 +109,7 @@ virtx() {
 	local retval=0
 	local OLD_SANDBOX_ON="${SANDBOX_ON}"
 	local XVFB XHOST XDISPLAY
-	local xvfbargs="-screen 0 1280x1024x24 +extension RANDR"
+	local xvfbargs=( -screen 0 1280x1024x24 +extension RANDR )
 	XVFB=$(type -p Xvfb) || die
 	XHOST=$(type -p xhost) || die
 
@@ -134,24 +134,24 @@ virtx() {
 	# We really do not want SANDBOX enabled here
 	export SANDBOX_ON="0"
 
-	debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
-	${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
+	debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs[*]}"
+	${XVFB} :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
 	sleep 2
 
 	local start=${XDISPLAY}
 	while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do
 		# Stop trying after 15 tries
 		if ((XDISPLAY - start > 15)) ; then
-			eerror "'${XVFB} :${XDISPLAY} ${xvfbargs}' returns:"
+			eerror "'${XVFB} :${XDISPLAY} ${xvfbargs[*]}' returns:"
 			echo
-			${XVFB} :${XDISPLAY} ${xvfbargs}
+			${XVFB} :${XDISPLAY} "${xvfbargs[@]}"
 			echo
 			eerror "If possible, correct the above error and try your emerge again."
 			die "Unable to start Xvfb"
 		fi
 			((XDISPLAY++))
-		debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
-		${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
+		debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs[*]}"
+		${XVFB} :${XDISPLAY} "${xvfbargs[@]}" &>/dev/null &
 		sleep 2
 	done
 
-- 
2.35.1