diff --git a/defaults.inc b/defaults.inc index 5665b40..b4e4461 100755 --- a/defaults.inc +++ b/defaults.inc @@ -3,6 +3,6 @@ action="$1" FOLDER='/opt/idssys/ta-proxmenu' -VERS='0.1-12142025' +VERS='0.2-12142025' diff --git a/proxmenu-scripts.sh b/proxmenu-scripts.sh index b6fd4ef..c3b94d3 100755 --- a/proxmenu-scripts.sh +++ b/proxmenu-scripts.sh @@ -4,7 +4,7 @@ [ "${2}" != "q" ] && source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc -source /opt/idssys/linupx/defaults.inc +source /opt/idssys/ta-proxmenu/defaults.inc diff --git a/run.sh b/run.sh index 2b71f4a..e75d58f 100755 --- a/run.sh +++ b/run.sh @@ -6,19 +6,19 @@ source /opt/idssys/defaults/default.inc source /opt/idssys/ta-proxmenu/defaults.inc if curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then - if [ "${1}" != "runup" ]; then + if [ "${1}" != "tapm" ]; then echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}" echo "" udtd=0 fi - if [ "${1}" != "runup" ]; then + if [ "${1}" != "tapm" ]; then if [ ! -d /opt/idssys/defaults ]; then git clone https://git.schroedercity.com/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}" != "runup" ]; then + if [ "${1}" != "tapm" ]; then echo -en "\e[1A"; echo -en "\e[0K\r${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}" udtd=1 @@ -29,14 +29,14 @@ if curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP git repack -ad >/dev/null 2>&1 git prune >/dev/null 2>&1 git pull >/dev/null 2>&1 - [ "${1}" != "runup" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}" + [ "${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}" != "runup" ]; 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 @@ -47,13 +47,13 @@ if curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP git prune >/dev/null 2>&1 git pull >/dev/null 2>&1 - if [ "${1}" != "runup" ]; then + 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]}" fi - elif [ "${1}" != "runup" ] && [ ${udtd} -eq 0 ]; then + elif [ "${1}" != "tapm" ] && [ ${udtd} -eq 0 ]; then echo -e "\e[1A\e[0K\r ${idsCL[Green]}No updates available${idsCL[Default]}" echo "" fi @@ -62,7 +62,7 @@ else echo -e "${idsCL[Red]}Could not connect to 'git.schroedercity.com' for updates${idsCL[Default]}" fi -if [ "${1}" != "runup" ] && [ "${1}" != "update" ] && [ "${1}" != "u" ]; then +if [ "${1}" != "tapm" ] && [ "${1}" != "update" ] && [ "${1}" != "u" ]; then /opt/idssys/ta-proxmenu/proxmenu-scripts.sh $1 $2 $3 $4 fi