bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Remove more unecessaary command arrays

Browse Source
This commit is contained in:
Bryan Roessler
2023-02-15 12:02:52 -05:00
parent c5f6ec51cc
commit df980f103c
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
installJRMC
View File

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