From 562b63ba7fc74d7c6c280849179c1dffab925ded Mon Sep 17 00:00:00 2001 From: tangobravo14 Date: Tue, 27 Feb 2024 06:35:24 +0000 Subject: [PATCH] more fixes for vara install --- AmRRON-Setup-Script.sh | 24 +++++++++--------------- AmRRON-Vara-setup.sh | 6 +++--- changelogs/CHANGELOG-Vara-setup.md | 3 +++ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 55a0433..3a40a2c 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.7.5.3 ######################## +######################## AmRRON Setup Script v0.7.5.4 ######################## ######################## Created by TB-14 ######################## -######################## 26 Feb 2024 ######################## +######################## 27 Feb 2024 ######################## ################################################################################ ################################################################################ # @@ -471,7 +471,7 @@ echo "80% Complete" #if [[ $NEWELECTRUM == "" ]]; then # NEWELECTRUM="SERVER DOWN" #fi -NEWELECTRUM="SERVER DOWN" +#NEWELECTRUM="SERVER DOWN" NEWVOACAPL=$(curl -sL https://api.github.com/repos/jawatson/voacapl/releases/latest | grep tag_name | awk -F 'v.' '{print $2}' | sed s/\",//) if [[ $NEWVOACAPL == "" ]]; then @@ -3416,7 +3416,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "MATCHBOX_KEYBOARD" "Touchscreen keyboard" "${KEYBOARDVER}" \ false "SCREEN" "Useful tool for terminal management." "${SCREENVER}" \ false "SPEEDTEST" "Run internet speedtests from the command line." "${SPEEDTESTVER}" \ - false "ELECTRUM" "Electrum BTC Wallet." "" \ + false "ELECTRUM" "No longer supported." "" \ false "RASPAP" "Turn your Pi 3 into an Access Point (Hotspot)." "" \ false "CONKY" "Conky system monitor" "${CONKYVER}" \ false "LIBREOFFICE" "LibreOffice Suite" "${LIBREVER}" \ @@ -3424,7 +3424,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s rc=$? if [[ $rc == 2 ]]; then - otherArray=(GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST ELECTRUM CONKY LIBREOFFICE) + otherArray=(GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE) for i in "${otherArray[@]}" do @@ -3857,7 +3857,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "PACKET" "Minicom, GTKTerm, Direwolf, etc" \ false "SDR" "Nothing in here yet. Stay tuned..." \ false "SECURITY" "Veracrypt, Fail2ban, KeepassXC, Bitmessage, disable wireless etc." \ - false "OTHER" "Electrum, Hotspot, touch keyboard, gedit,etc" \ + false "OTHER" "Hotspot, touch keyboard, gedit,etc" \ false "ICONS" "Creates Desktop Icons for installed programs" \ ${r} ${c} >>/tmp/mastermenu @@ -3878,7 +3878,7 @@ rc=$? mkdir -p $USERDIR fi CONKYSEL=STANDARD - easyArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMSTATX PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST ELECTRUM CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS) + easyArray=(HAMLIB FLDIGI FLMSG FLAMP FLRIG FLWRAP ARDOP ARDOPGUI ARIM GARIM VARIM PAT FINDARDOP VOACAP CHIRP WSJTX JS8CALL COMSTATX PULSE UBLOX FORMS MINICOM GTKTERM PUTTY DIREWOLF YAAC PACKET_GUIDE GEDIT VIM FILEZILLA MATCHBOX_KEYBOARD SCREEN SPEEDTEST CONKY LIBREOFFICE FAIL2BAN KEEPASS ICEWEASEL PTE PFE VERACRYPT BITMESSAGE HARDEN_SSH GTKHASH KLEOPATRA ICONS) for i in "${easyArray[@]}" do @@ -4051,9 +4051,6 @@ cat /tmp/results | yad --text-info --center \ RASPAP) raspap_install ;; - ELECTRUM) echo "Installing Electrum Bitcoin Wallet" - electrum_install - ;; CONKY) conky_install ;; @@ -4310,11 +4307,8 @@ cleanupyad noelectrum) TITLE="Electrum Unavailable" -TEXT="You have selected to install Electrum on a Raspberry Pi or a system \ -that does not natively support Python 3.6.1 or greater. - -At this time, the required Python3 modules are not compatible with your system \ -or will need to be self satisfied." +TEXT="This script no longer supports installing electrum. You will need to manually determine \ +how you will need to install it for your system." cleanupyad ;; diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index 6f75eca..ff3580e 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ - ####################### AmRRON Vara Setup v.0.4 ######################### + ####################### AmRRON Vara Setup v.0.5 ######################### ####################### Created by TB-14 ######################### - ####################### 26 Feb 2024 ######################### + ####################### 27 Feb 2024 ######################### ################################################################################ ################################################################################ @@ -197,7 +197,7 @@ echo "VARA FM: ${VARAFMVER} available" VARAFMLINK=https://downloads.winlink.org/VARA%20Products/VARA%20FM%20${VARAFMVER}%20setup.zip echo "VARA FM URL: ${VARAFMLINK}" -VARAHFLINK=https://downloads.winlink.org/VARA%20Products/VARA%20HF%20${VARAHFVER}%20setup.zip +VARAHFLINK=https://downloads.winlink.org/VARA%20Products/VARA%20HF%20${VARAHFVER}%20%20setup.zip echo "VARA HF URL: ${VARAHFLINK}" #VARACHATLINK=$(curl -s https://rosmodem.wordpress.com/ | grep -oP '(?=https://mega.nz).*?(?=" target="_blank" rel="noopener noreferrer">VARA Chat v)') diff --git a/changelogs/CHANGELOG-Vara-setup.md b/changelogs/CHANGELOG-Vara-setup.md index 0fa0e64..68c8688 100644 --- a/changelogs/CHANGELOG-Vara-setup.md +++ b/changelogs/CHANGELOG-Vara-setup.md @@ -1,3 +1,6 @@ +# Version 0.5 +- Download link changed and added additional space. Hard coded into link for current version. Will likely break on version change. + # Version 0.4 - Updated Linux Mint version checking through 21.3 - Updated download links to point to downloads.winlink.org