From 26fbc5363f8f56d3a53fb7e35bfc6464b73a0f56 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 9 Apr 2022 16:58:58 -0500 Subject: [PATCH] Update linupx-scripts.sh --- linupx-scripts.sh | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/linupx-scripts.sh b/linupx-scripts.sh index 800706e..a18be8a 100755 --- a/linupx-scripts.sh +++ b/linupx-scripts.sh @@ -68,12 +68,17 @@ UPDATE1() { if type yum &>/dev/null; then $APTFUNC -y update else - if [ "$useAutoremove" -ne 0 ]; then - AUTOREMOVE - $APTFUNC update - $APTFUNC upgrade -y - AUTOREMOVE - fi + if [ "$useAutoremove" -ne 0 ]; then; AUTOREMOVE; fi + + $APTFUNC update + $APTFUNC upgrade -y + + read -n 1 -p "Would you like to run dist-upgrade as well (Y/n)?" choice + case "$choice" in + [Yy]) $APTFUNC dist-upgrade;; + esac + + if [ "$useAutoremove" -ne 0 ]; then; AUTOREMOVE; fi fi if [ "$opennms" = true ]; then sudo apt-mark hold libopennms-java libopennmsdeps-java opennms-common opennms-db @@ -88,14 +93,22 @@ UPDATE2() { if [ "$opennms" = true ]; then sudo apt-mark unhold libopennms-java libopennmsdeps-java opennms-common opennms-db fi - if [ "$useAutoremove" -ne 0 ]; then - AUTOREMOVE - $APTFUNC upgrade -y - AUTOREMOVE - fi + + if [ "$useAutoremove" -ne 0 ]; then; AUTOREMOVE; fi + + $APTFUNC upgrade -y + + read -n 1 -p "Would you like to run dist-upgrade as well (Y/n)?" choice + case "$choice" in + [Yy]) $APTFUNC dist-upgrade;; + esac + + if [ "$useAutoremove" -ne 0 ]; then; AUTOREMOVE; fi + if [ "$opennms" = true ]; then sudo apt-mark hold libopennms-java libopennmsdeps-java opennms-common opennms-db fi + touch "${FOLDER}/lastrun" echo "" echo -e "${Green}Updated Upgrades have completed${Color_Off}"