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

Fix centos/fedora package manager

Browse Source
This commit is contained in:
Bryan Roessler
2022-02-12 12:58:50 -05:00
parent ae4a3d3d25
commit c3648fdae3
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
installJRMC
View File

@@ -1396,7 +1396,7 @@ tests() {
main() { main() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
declare -g ID declare -g ID MGR
if [[ -e "/etc/os-release" ]]; then if [[ -e "/etc/os-release" ]]; then
source "/etc/os-release" source "/etc/os-release"
@@ -1411,9 +1411,9 @@ main() {
case "$ID" in case "$ID" in
centos|fedora) centos|fedora)
if hash dnf &>/dev/null; then if hash dnf &>/dev/null; then
declare mgr="dnf" MGR="dnf"
elif hash yum &>/dev/null; then elif hash yum &>/dev/null; then
declare mgr="yum" MGR="yum"
fi fi
;; ;;
debian|ubuntu|arch) debian|ubuntu|arch)
@@ -1429,10 +1429,10 @@ main() {
echo "Autodetecting distro, this may be unreliable and --compat may also be required" echo "Autodetecting distro, this may be unreliable and --compat may also be required"
if hash dnf &>/dev/null; then if hash dnf &>/dev/null; then
ID="fedora" ID="fedora"
declare mgr="dnf" MGR="dnf"
elif hash yum &>/dev/null; then elif hash yum &>/dev/null; then
ID="centos" ID="centos"
declare mgr="yum" MGR="yum"
elif hash apt &>/dev/null; then elif hash apt &>/dev/null; then
ID="ubuntu" ID="ubuntu"
elif hash pacman &>/dev/null; then elif hash pacman &>/dev/null; then
@@ -1445,12 +1445,11 @@ main() {
# Distro-specific commands # Distro-specific commands
if [[ "$ID" =~ ^(fedora|centos)$ ]]; then if [[ "$ID" =~ ^(fedora|centos)$ ]]; then
pkg_install(){ sudo "$mgr" install -y "$@"; } pkg_install(){ sudo "$MGR" install -y "$@"; }
pkg_remove(){ sudo "$mgr" remove -y "$@"; } pkg_remove(){ sudo "$MGR" remove -y "$@"; }
pkg_update(){ sudo "$mgr" makecache; } pkg_update(){ sudo "$MGR" makecache; }
pkg_query(){ rpm -q "$@"; } pkg_query(){ rpm -q "$@"; }
firewall_cmd(){ sudo firewall-cmd "$@"; } firewall_cmd(){ sudo firewall-cmd "$@"; }
unset mgr
elif [[ "$ID" =~ ^(debian|ubuntu)$ ]]; then elif [[ "$ID" =~ ^(debian|ubuntu)$ ]]; then
pkg_install(){ sudo apt-get install -y -q0 "$@"; } pkg_install(){ sudo apt-get install -y -q0 "$@"; }
pkg_remove(){ sudo apt-get remove --auto-remove -y -q0 "$@"; } pkg_remove(){ sudo apt-get remove --auto-remove -y -q0 "$@"; }