voltron/LinUPx
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Update linupx-scripts.sh

Browse Source
This commit is contained in:
David Schroeder
2023-08-24 22:51:41 -05:00
parent 677aa69419
commit 89c6e4c13f
1 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
linupx-scripts.sh
View File

@@ -65,14 +65,7 @@ UPDATE1() {
${APTFUNC} update
${APTFUNC} upgrade -y
${APTFUNC} dist-upgrade
# echo
# read -n 1 -p "Would you like to run dist-upgrade as well (Y/n)?" choice
# echo
# case "$choice" in
# [Yy]) ${APTFUNC} dist-upgrade;;
# esac
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
fi
@@ -93,13 +86,7 @@ UPDATE2() {
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
${APTFUNC} upgrade -y
echo
read -n 1 -p "Would you like to run dist-upgrade as well (Y/n)?" choice
echo
case "$choice" in
[Yy]) ${APTFUNC} dist-upgrade;;
esac
${APTFUNC} dist-upgrade
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
@@ -136,12 +123,11 @@ UPDATE3() {
if [ "$opennms" = true ]; then
sudo apt-mark unhold libopennms-java libopennmsdeps-java opennms-common opennms-db
fi
if [ "$useAutoremove" -ne 0 ]; then
${APTFUNC} -y autoremove &>> /opt/runupdates.log
${APTFUNC} update &>> /opt/runupdates.log
${APTFUNC} upgrade -y &>> /opt/runupdates.log
${APTFUNC} -y autoremove &>> /opt/runupdates.log
fi
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE >> /opt/runupdates.log
${APTFUNC} update >> /opt/runupdates.log
${APTFUNC} upgrade -y >> /opt/runupdates.log
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE >> /opt/runupdates.log
if [ "$opennms" = true ]; then
sudo apt-mark hold libopennms-java libopennmsdeps-java opennms-common opennms-db
fi
@@ -169,12 +155,10 @@ UPDATE4() {
if type yum &>/dev/null; then
yum -y update
else
if [[ "$useAutoremove" -ne 0 ]]; then
${APTFUNC} -y autoremove
${APTFUNC} update
${APTFUNC} upgrade -y
${APTFUNC} -y autoremove
fi
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
${APTFUNC} update
${APTFUNC} upgrade -y
[[ "$useAutoremove" -ne 0 ]] && AUTOREMOVE
fi
touch "${FOLDER}/lastrun"
echo
@@ -205,12 +189,13 @@ PIPUPGRADE() {
then
${APTFUNC} install jq -y
fi
[ "${1}" == "ii" ] && ii='--ignore-installed' || ii=''
if [ "$EUID" -ne 0 ]; then
sudo python3 -m pip install --upgrade pip
sudo pip3 list --outdated --format=json | jq -r '.[] | "\(.name)==\(.latest_version)"' | xargs -n1 pip3 install --ignore-installed -U
sudo pip3 list --outdated --format=json | jq -r '.[] | "\(.name)==\(.latest_version)"' | xargs -n1 pip3 install ${ii} -U
else
python3 -m pip install --upgrade pip
pip3 list --outdated --format=json | jq -r '.[] | "\(.name)==\(.latest_version)"' | xargs -n1 pip3 install --ignore-installed -U
pip3 list --outdated --format=json | jq -r '.[] | "\(.name)==\(.latest_version)"' | xargs -n1 pip3 install ${ii} -U
fi
echo
echo -e "${idsCL[Green]}Python-Pip Upgrades has completed${idsCL[Default]}"
@@ -882,6 +867,7 @@ SCRIPT_MENU() {
echo -e " [${idsCL[Yellow]}5${idsCL[Default]}] Run Dist-Upgrade"
fi
echo -e "*[${idsCL[Yellow]}6${idsCL[Default]}] Run Python-Pip Upgrades"
echo -e "*[${idsCL[Yellow]}7${idsCL[Default]}] Run Python-Pip Upgrades (w/ --ignore-installed)"
echo
if [ "$ATYPE" != 'yum' ]; then
echo -e " [${idsCL[Yellow]}9${idsCL[Default]}] Update/Fix Missing APT Repo Keys"
@@ -915,6 +901,8 @@ SCRIPT_MENU() {
SCRIPT_MENU;;
6) PIPUPGRADE
SCRIPT_MENU;;
7) PIPUPGRADE ii
SCRIPT_MENU;;
9) UPDATEREPOKEYS
SCRIPT_MENU;;
0) ENDISASU