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

Move PKG_QUERY to command array

Browse Source
This commit is contained in:
Bryan Roessler
2023-03-23 13:38:30 -04:00
parent 439361e4cb
commit 2ac82ccbde
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
installJRMC
View File

@@ -128,7 +128,7 @@ init() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
declare -g ID RPM_MGR ARCH declare -g ID RPM_MGR ARCH
declare -ga PKG_INSTALL PKG_REMOVE PKG_UPDATE declare -ga PKG_INSTALL PKG_REMOVE PKG_UPDATE PKG_QUERY
echo "Starting installJRMC" echo "Starting installJRMC"
(( DEBUG )) || echo "To enable debugging output, use --debug or -d" (( DEBUG )) || echo "To enable debugging output, use --debug or -d"
@@ -207,34 +207,35 @@ init() {
PKG_INSTALL=(execute sudo "$RPM_MGR" install -y) PKG_INSTALL=(execute sudo "$RPM_MGR" install -y)
PKG_REMOVE=(execute udo "$RPM_MGR" remove -y) PKG_REMOVE=(execute udo "$RPM_MGR" remove -y)
PKG_UPDATE=(execute sudo "$RPM_MGR" makecache) PKG_UPDATE=(execute sudo "$RPM_MGR" makecache)
PKG_QUERY(){ rpm -q "$@"; } PKG_QUERY=(rpm -q)
PKG_INSTALL_LOCAL(){ installMCRPM; } PKG_INSTALL_LOCAL(){ installMCRPM; }
;; ;;
debian|ubuntu) debian|ubuntu)
PKG_INSTALL=(execute sudo apt-get -f install -y -q0) PKG_INSTALL=(execute sudo apt-get -f install -y -q0)
PKG_REMOVE=(execute sudo apt-get remove --auto-remove -y -q0) PKG_REMOVE=(execute sudo apt-get remove --auto-remove -y -q0)
PKG_UPDATE=(execute sudo apt-get update -y -q0) PKG_UPDATE=(execute sudo apt-get update -y -q0)
PKG_QUERY(){ dpkg -s "$@"; } PKG_QUERY=(dpkg -s)
PKG_INSTALL_LOCAL(){ installMCDEB; } PKG_INSTALL_LOCAL(){ installMCDEB; }
;; ;;
suse) suse)
PKG_INSTALL=(execute sudo zypper --non-interactive -q install --force --no-confirm) PKG_INSTALL=(execute sudo zypper --non-interactive -q install --force --no-confirm)
PKG_REMOVE=(execute sudo zypper --non-interactive -q remove --clean-deps) PKG_REMOVE=(execute sudo zypper --non-interactive -q remove --clean-deps)
PKG_UPDATE=(execute sudo zypper --non-interactive -q refresh jriver) PKG_UPDATE=(execute sudo zypper --non-interactive -q refresh jriver)
PKG_QUERY(){ rpm -q "$@"; } PKG_QUERY=(rpm -q)
PKG_INSTALL_LOCAL(){ installMCRPM; } PKG_INSTALL_LOCAL(){ installMCRPM; }
;; ;;
arch) arch)
PKG_INSTALL=(execute sudo pacman -Sy --noconfirm) PKG_INSTALL=(execute sudo pacman -Sy --noconfirm)
PKG_REMOVE=(execute sudo pacman -Rs --noconfirm) PKG_REMOVE=(execute sudo pacman -Rs --noconfirm)
PKG_UPDATE=(execute sudo pacman -Syy) PKG_UPDATE=(execute sudo pacman -Syy)
PKG_QUERY(){ sudo pacman -Qs "$@"; } PKG_QUERY=(sudo pacman -Qs)
PKG_INSTALL_LOCAL(){ installMCARCH; } PKG_INSTALL_LOCAL(){ installMCARCH; }
;; ;;
unknown) unknown)
PKG_INSTALL=(:) PKG_INSTALL=(:)
PKG_REMOVE=(:) PKG_REMOVE=(:)
PKG_UPDATE=(:) PKG_UPDATE=(:)
PKG_QUERY=(:)
PKG_INSTALL_LOCAL(){ installMCGENERIC; } PKG_INSTALL_LOCAL(){ installMCGENERIC; }
esac esac
} }
@@ -510,7 +511,7 @@ installPackage() {
fi fi
if (( no_install_check )) || if (( no_install_check )) ||
! (hash "$pkg" &>/dev/null || ! (hash "$pkg" &>/dev/null ||
PKG_QUERY "$pkg" &>/dev/null); then "${PKG_QUERY[@]}" "$pkg" &>/dev/null); then
pkg_array+=("$pkg") pkg_array+=("$pkg")
else else
debug "$pkg already installed, skipping installation" debug "$pkg already installed, skipping installation"
@@ -552,8 +553,8 @@ installMesa() {
# 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
if ! execute sudo dnf swap -y \ if ! execute sudo dnf swap -y \
mesa-va-drivers \ mesa-va-drivers \
mesa-va-drivers-freeworld; then mesa-va-drivers-freeworld; then
@@ -1719,13 +1720,13 @@ main() {
echo "Adding EPEL repository" echo "Adding EPEL repository"
installPackage epel-release installPackage epel-release
fi fi
if ! PKG_QUERY rpmfusion-free-release &>/dev/null; then if ! "${PKG_QUERY[@]}" rpmfusion-free-release &>/dev/null; then
installPackage --no-install-check \ installPackage --no-install-check \
"https://download1.rpmfusion.org/free/el/rpmfusion-free-release-$VERSION_ID.noarch.rpm" "https://download1.rpmfusion.org/free/el/rpmfusion-free-release-$VERSION_ID.noarch.rpm"
fi fi
;; ;;
fedora) fedora)
if ! PKG_QUERY rpmfusion-free-release &>/dev/null; then if ! "${PKG_QUERY[@]}" rpmfusion-free-release &>/dev/null; then
installPackage --no-install-check \ installPackage --no-install-check \
"https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$VERSION_ID.noarch.rpm" "https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$VERSION_ID.noarch.rpm"
fi fi