From ecb17b3e238d2f57e9488f73bb450cb1693e121c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 26 Mar 2026 18:43:31 -0500 Subject: [PATCH] update --- defaults.inc | 5 ++- run.sh | 102 ++++++++++++++++++++++++++------------------------- 2 files changed, 56 insertions(+), 51 deletions(-) diff --git a/defaults.inc b/defaults.inc index 0e765ed..f50fa46 100755 --- a/defaults.inc +++ b/defaults.inc @@ -3,7 +3,10 @@ action="$1" FOLDER='/opt/idssys/ta-proxmenu' -VERS='2026.3.26-1' +VERS='2026.3.26-3' + +noupdate=' restart cpu ' + RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) diff --git a/run.sh b/run.sh index fc875c6..d61597d 100755 --- a/run.sh +++ b/run.sh @@ -5,60 +5,62 @@ source /opt/idssys/defaults/default.inc source /opt/idssys/ta-proxmenu/defaults.inc -if curl -m 3 -s --head --request GET https://git.scity.us | grep "HTTP/2 200" > /dev/null; then - if [ "${1}" != "tapm" ]; then - echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}" - echo "" - udtd=0 - fi +if [[ "${noupdate}" != *" ${1} "* ]] && [[ "${noupdate}" != *" ${2} "* ]]; then + if curl -m 3 -s --head --request GET https://git.scity.us | grep "HTTP/2 200" > /dev/null; then + if [ "${1}" != "tapm" ]; then + echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}" + echo "" + udtd=0 + fi - if [ "${1}" != "tapm" ]; then - if [ ! -d /opt/idssys/defaults ]; then - git clone https://git.scity.us/voltron/iDS-Defaults.git /opt/idssys/defaults - else - cd /opt/idssys/defaults - if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then - if [ "${1}" != "tapm" ]; then - echo -en "\e[1A"; - echo -en "\e[0K\r${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}" - udtd=1 - fi - git fetch origin master >/dev/null 2>&1 - git reset --hard origin/master >/dev/null 2>&1 - git reflog expire --expire=now --all >/dev/null 2>&1 - git repack -ad >/dev/null 2>&1 - git prune >/dev/null 2>&1 - git pull >/dev/null 2>&1 - [ "${1}" != "tapm" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}" - fi - fi - fi + if [ "${1}" != "tapm" ]; then + if [ ! -d /opt/idssys/defaults ]; then + git clone https://git.scity.us/voltron/iDS-Defaults.git /opt/idssys/defaults + else + cd /opt/idssys/defaults + if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then + if [ "${1}" != "tapm" ]; then + echo -en "\e[1A"; + echo -en "\e[0K\r${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}" + udtd=1 + fi + git fetch origin master >/dev/null 2>&1 + git reset --hard origin/master >/dev/null 2>&1 + git reflog expire --expire=now --all >/dev/null 2>&1 + git repack -ad >/dev/null 2>&1 + git prune >/dev/null 2>&1 + git pull >/dev/null 2>&1 + [ "${1}" != "tapm" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}" + fi + fi + fi - cd /opt/idssys/ta-proxmenu - if [ "`git log --pretty=%H ...refs/heads/main^ | head -n 1`" != "`git ls-remote origin -h refs/heads/main |cut -f1`" ]; then - if [ "${1}" != "tapm" ]; then - [ ${udtd} -eq 0 ] && echo -en "\e[1A"; - echo -en "\e[0K\r${idsCL[LightCyan]}Updating TA-Proxmenu...${idsCL[Default]}" - fi - git fetch origin main >/dev/null 2>&1 - git reset --hard origin/main >/dev/null 2>&1 - git reflog expire --expire=now --all >/dev/null 2>&1 - git repack -ad >/dev/null 2>&1 - git prune >/dev/null 2>&1 - git pull >/dev/null 2>&1 + cd /opt/idssys/ta-proxmenu + if [ "`git log --pretty=%H ...refs/heads/main^ | head -n 1`" != "`git ls-remote origin -h refs/heads/main |cut -f1`" ]; then + if [ "${1}" != "tapm" ]; then + [ ${udtd} -eq 0 ] && echo -en "\e[1A"; + echo -en "\e[0K\r${idsCL[LightCyan]}Updating TA-Proxmenu...${idsCL[Default]}" + fi + git fetch origin main >/dev/null 2>&1 + git reset --hard origin/main >/dev/null 2>&1 + git reflog expire --expire=now --all >/dev/null 2>&1 + git repack -ad >/dev/null 2>&1 + git prune >/dev/null 2>&1 + git pull >/dev/null 2>&1 - if [ "${1}" != "tapm" ]; then - source /opt/idssys/ta-proxmenu/defaults.inc - # echo -en "\e[1A"; - # echo -e "\e[0K\r ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}" - echo -e " ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}\n" - fi - elif [ "${1}" != "tapm" ] && [ ${udtd} -eq 0 ]; then - echo -e "\e[1A\e[0K\r ${idsCL[Green]}No updates available${idsCL[Default]}\n" - fi + if [ "${1}" != "tapm" ]; then + source /opt/idssys/ta-proxmenu/defaults.inc + # echo -en "\e[1A"; + # echo -e "\e[0K\r ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}" + echo -e " ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}\n" + fi + elif [ "${1}" != "tapm" ] && [ ${udtd} -eq 0 ]; then + echo -e "\e[1A\e[0K\r ${idsCL[Green]}No updates available${idsCL[Default]}\n" + fi -else - echo -e "${idsCL[Red]}Could not connect to 'git.scity.us' for updates${idsCL[Default]}" + else + echo -e "${idsCL[Red]}Could not connect to 'git.scity.us' for updates${idsCL[Default]}" + fi fi if [ "${1}" != "tapm" ] && [ "${1}" != "update" ] && [ "${1}" != "u" ]; then