diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index aa5e43a..61345e5 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -175,19 +175,23 @@ fi } ################# +echo +echo "Checking on current versions of VARA and RMS Express" +echo + VARAHFVER=$(curl -s https://rosmodem.wordpress.com/ | grep -m 1 "VARA HF" | awk -F "VARA HF" '{print $2}' | awk -F " " '{print $1}' | sed s/\ //g) VARAFMVER=$(curl -s https://rosmodem.wordpress.com/ | grep -m 1 "VARA FM" | awk -F "VARA FM" '{print $2}' | awk -F " " '{print $1}' | sed s/\ //g) -VARACHATVER=$(curl -s https://rosmodem.wordpress.com/ | grep -m 1 "VARA Chat" | awk -F "VARA Chat" '{print $2}' | awk -F " " '{print $1}' | sed s/\ //g) +#VARACHATVER=$(curl -s https://rosmodem.wordpress.com/ | grep -m 1 "VARA Chat" | awk -F "VARA Chat" '{print $2}' | awk -F " " '{print $1}' | sed s/\ //g) VARAFMLINK=$(curl -s https://rosmodem.wordpress.com/ | grep -oP '(?=https://mega.nz).*?(?=" target="_blank" rel="noopener noreferrer">VARA FM v)') VARAHFLINK=$(curl -s https://rosmodem.wordpress.com/ | grep -oP '(?=https://mega.nz).*?(?=" target="_blank" rel="noopener noreferrer">VARA HF v)') -VARACHATLINK=$(curl -s https://rosmodem.wordpress.com/ | grep -oP '(?=https://mega.nz).*?(?=" target="_blank" rel="noopener noreferrer">VARA Chat v)') +#VARACHATLINK=$(curl -s https://rosmodem.wordpress.com/ | grep -oP '(?=https://mega.nz).*?(?=" target="_blank" rel="noopener noreferrer">VARA Chat v)') function primer_menu() { echo "This program is designed to assist you with installing VARA HF, VARA FM \ -VARA Chat, and Winlink RMS Express on your linux machine. The current version has \ +, and Winlink RMS Express on your linux machine. The current version has \ only been tested on Mint 21. I will continue to expand support for Mint 20 and Rasberry Pi OS \ in the future. @@ -203,7 +207,7 @@ line of this script to alsa if you desire to use alsa instead. This will: \ check and add user to the dialout, audio, and tty usergroups; \ -Install wine and winetricks; download and install VARA HF, FM, and Chat; \ +Install wine and winetricks; download and install VARA HF and FM; \ download and install Winlink Express." | yad \ --image=$DIR/images/corps-icon.png \ --text-info \ @@ -296,18 +300,18 @@ megadl $VARAHFLINK || { ERRCODE="Failed to download VARA HF"; errors; return; } megadl $VARAFMLINK || { ERRCODE="Failed to download VARA FM"; errors; return; } -megadl $VARACHATLINK || -{ ERRCODE="Failed to download VARA Chat"; errors; return; } +#megadl $VARACHATLINK || +#{ ERRCODE="Failed to download VARA Chat"; errors; return; } unzip VARA\ FM\ $VARAFMVER\ Setup.zip || { ERRCODE="Failed to unzip VARA FM"; errors; return; } unzip VARA\ HF\ $VARAHFVER\ Setup.zip || { ERRCODE="Failed to unzip VARA HF"; errors; return; } -unzip VARA\ Chat\ $VARACHATVER\ Setup.zip || -{ ERRCODE="Failed to unzip VARA Chat"; errors; return; } +#unzip VARA\ Chat\ $VARACHATVER\ Setup.zip || +#{ ERRCODE="Failed to unzip VARA Chat"; errors; return; } -rm VARA\ FM\ $VARAFMVER\ Setup.zip VARA\ HF\ $VARAHFVER\ Setup.zip VARA\ Chat\ $VARACHATVER\ Setup.zip || +rm VARA\ FM\ $VARAFMVER\ Setup.zip VARA\ HF\ $VARAHFVER\ Setup.zip || #VARA\ Chat\ $VARACHATVER\ Setup.zip || { ERRCODE="Failed to remove VARA zip files"; errors; return; } #install VARA FM with wine /usr/bin/wine VARA\ FM\ setup\ \(Run\ as\ Administrator\).exe || @@ -316,8 +320,8 @@ rm VARA\ FM\ $VARAFMVER\ Setup.zip VARA\ HF\ $VARAHFVER\ Setup.zip VARA\ Chat\ $ /usr/bin/wine VARA\ setup\ \(Run\ as\ Administrator\).exe || { ERRCODE="Failed to install VARA HF"; errors; return; } #install VARA Chat with wine -/usr/bin/wine VARA\ Chat\ setup\ \(Run\ as\ Administrator\).exe || -{ ERRCODE="Failed to install VARA Chat"; errors; return; } +#/usr/bin/wine VARA\ Chat\ setup\ \(Run\ as\ Administrator\).exe || +#{ ERRCODE="Failed to install VARA Chat"; errors; return; } #Install Driver cd $HOME/Downloads && wget http://files.k6eta.com/pdh.dll.zip || @@ -341,15 +345,6 @@ unzip Winlink_Express_install*.zip && rm Winlink_Express_install*.zip || } -function installpi() { - - - -} - - - - function failure_handling() { FAIL=$(cat /tmp/varafailures) || echo "No failures recorded"