diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 40e318b..34855cd 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v1.2.5 ######################## +######################## AmRRON Setup Script v1.2.5.1 ######################## ######################## Created by TB-14 ######################## -######################## 26 JUN 2025 ######################## +######################## 27 JUN 2025 ######################## ################################################################################ ################################################################################ # @@ -1938,7 +1938,7 @@ if [[ ${JS8CALLVER} == ${NEWJS8CALLVER} ]]; then else -wget -P ~/Downloads -N $NEWJS8CALLURL || +rm /tmp/js8call* && wget -P /tmp/ -N $NEWJS8CALLURL || { ERRCODE="Failed to download JS8Call"; errors; return; } if [[ ${JS8CALLVER} == "2.2.1-devel" ]]; then @@ -1953,7 +1953,7 @@ sudo apt remove js8call -y --allow-change-held-packages || fi -cd ~/Downloads && sudo apt install -y ./$JS8CALL_DEB_NAME || +cd /tmp/ && sudo apt install -y ./$JS8CALL_DEB_NAME || { ERRCODE="Failed to install $JS8CALL_DEB_NAME"; errors; return; } rm ~/Downloads/$JS8CALL_DEB_NAME || @@ -1965,7 +1965,7 @@ fi function js8call_2.2.0_install() { -wget -P ~/Downloads -N http://files.js8call.com/2.2.0/js8call_2.2.0_20.04_amd64.deb || +rm /tmp/js8* && wget -P /tmp/ -N http://files.js8call.com/2.2.0/js8call_2.2.0_20.04_amd64.deb || { ERRCODE="Failed to download JS8Call 2.2.0"; errors; return; } if [[ ${JS8CALLVER} == "2.2.1-devel" ]]; then @@ -1975,19 +1975,19 @@ if [[ ${JS8CALLVER} == "2.2.1-devel" ]]; then fi if hash js8call 2>/dev/null; then -sudo apt uninstall js8call -y || +sudo apt remove js8call -y --allow-change-held-packages || { ERRCODE="Failed to uninstall JS8Call"; errors; return; } fi -cd ~/Downloads && sudo apt install ./js8call_2.2.0_20.04_amd64.deb || +cd /tmp/ && sudo apt install ./js8call_2.2.0_20.04_amd64.deb || { ERRCODE="Failed to install JS8Call 2.2.0"; errors; return; } sudo apt-mark hold js8call || { ERRCODE="Failed to mark JS8Call as hold"; errors; return; } -rm ~/Downloads/js8call_2.2.0_20.04_amd64.deb || -{ ERRCODE="Failed to delete js8call deb file from Downloads directory"; errors; return; } +rm /tmp/js8call* || +{ ERRCODE="Failed to delete js8call deb file"; errors; return; } } @@ -2524,7 +2524,7 @@ chmod +x $PACKETDIR/QtTermTCP || { ERRCODE="Failed to make QTtermTCP executable"; errors; return; } if [[ ! -f $USERDIR/icons/qttermtcp_icon.png ]]; then - cp ~/setup-scripts/images/qttermtcp.png $USERDIR/icons/qttermtcp.png || + mkdir -P $USERDIR/icons/ && cp ~/setup-scripts/images/qttermtcp.png $USERDIR/icons/qttermtcp.png || { ERRCODE="Failed to get icon image for QtTermTCP"; errors; } fi