From df980f103cd3b1db45da69219dfbcbbe42761ff0 Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Wed, 15 Feb 2023 12:02:52 -0500
Subject: [PATCH] Remove more unecessaary command arrays

---
 installJRMC | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/installJRMC b/installJRMC
index e93bcee..a2bcef3 100755
--- a/installJRMC
+++ b/installJRMC
@@ -431,7 +431,7 @@ setMCVersion() {
 installPackage() {
     debug "Running: ${FUNCNAME[0]}" "$@"
 
-    declare -a pkg_array install_flags pkg_install_cmd
+    declare -a pkg_array install_flags
     declare long_opts input pkg 
     declare skip_check_installed allow_downgrades silent refresh no_gpg_check
     declare -A pkg_aliases
@@ -837,19 +837,14 @@ installMCRPM() {
 installMesa() {
     debug "Running: ${FUNCNAME[0]}"
 
-    declare -a pkg_swap_cmd
-
     # Currently only necessary in Fedora/CentOS
     case "$ID" in
         fedora|centos)
             if ! pkg_query mesa-va-drivers-freeworld &>/dev/null; then
                 if pkg_query mesa-va-drivers &>/dev/null; then
-                    pkg_swap_cmd=(
-                        pkg_swap 
-                        mesa-va-drivers 
-                        mesa-va-drivers-freeworld
-                    )
-                    if ! execute "${pkg_swap_cmd[*]}"; then
+                    if ! execute pkg_swap \
+                        mesa-va-drivers \
+                        mesa-va-drivers-freeworld; then
                         err "Package swap failed!"
                         return 1
                     fi
@@ -1078,7 +1073,7 @@ setVNCPass() {
         if [[ ! -v VNCPASS ]]; then
             err "Refusing to overwrite existing $vncpassfile with an empty password"
             err "Remove existing $vncpassfile or use --vncpass ''"
-            exit 1
+            return 1
         else
             rm -f "$vncpassfile"
         fi