From 00a3e18dbe4ab626e24b62b84fe8dd08743c016e Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 1 May 2024 22:30:41 -0400 Subject: [PATCH] test --- common/functions.sh | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/common/functions.sh b/common/functions.sh index 5222222..646bb87 100644 --- a/common/functions.sh +++ b/common/functions.sh @@ -91,13 +91,20 @@ pkgmgr_update(){ PKG_MANAGER=$( get_pkg_mgr ) # Run apt update for distros that use apt - if [ "$PKG_MANAGER" == *"apt"* ] ; then + if [ "$PKG_MANAGER" == "apt" ] ; then + if should_apt_last_update ; then + "${PKG_MANAGER} update" + fi + fi + if [ "$PKG_MANAGER" == "apt-get" ] ; then if should_apt_last_update ; then "${PKG_MANAGER} update" fi fi - if [ "$PKG_MANAGER" == *"apt"* ] ; then + if [ "$PKG_MANAGER" == "apt" ] ; then + "$PKG_MANAGER" full-upgrade -y + elif [ "$PKG_MANAGER" == "apt-get" ] ; then "$PKG_MANAGER" full-upgrade -y elif [ "$PKG_MANAGER" == "dnf" ] ; then "$PKG_MANAGER" update @@ -143,7 +150,11 @@ pkgmgr_clean(){ printf "$COL_YELLOW" "Cleaning cache for $PKG_MANAGER" - if [ "$PKG_MANAGER" == *"apt"* ] ; then + if [ "$PKG_MANAGER" == "apt" ] ; then + "$PKG_MANAGER" clean + "$PKG_MANAGER" autoclean + "$PKG_MANAGER" autoremove -y + elif [ "$PKG_MANAGER" == "apt-get" ] ; then "$PKG_MANAGER" clean "$PKG_MANAGER" autoclean "$PKG_MANAGER" autoremove -y @@ -170,7 +181,12 @@ pkg_mgr_install_pkg() { PKG_MANAGER=$( get_pkg_mgr ) # Run apt update for distros that use apt - if [ "$PKG_MANAGER" == *"apt"* ] ; then + if [ "$PKG_MANAGER" == "apt" ] ; then + if should_apt_last_update ; then + "${PKG_MANAGER} update" + fi + fi + if [ "$PKG_MANAGER" == "apt-get" ] ; then if should_apt_last_update ; then "${PKG_MANAGER} update" fi