diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index dd8b202..8551a11 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -625,7 +625,7 @@ tested.\n\nThis installer has been tested on Raspberry Pi OS Buster and Bullseye VER=$(grep "VERSION_ID" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"') declare -A VER_MAP=(["11"]="bullseye" ["10"]="buster" ["9"]="stretch" ["8"]="jessie" ["16.04"]="xenial" \ ["14.04"]="trusty" ["18.04"]="bionic" ["18.10"]="cosmic" ["19.04"]="disco" ["19.10"]="eoan" ["20.04"]="focal" ["18"]="sara" ["18.1"]="serena" \ - ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ["20.3"]="una" ["21"]="vanessa" ["21.1"]="vera" ["21.2"]="victoria" ["21.3"]="virginia" ) + ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ["20.3"]="una" ["21"]="vanessa" ["21.1"]="vera" ["21.2"]="victoria" ["21.3"]="virginia" ["22"]="wilma" ) OSCN=${VER_MAP["${VER}"]} fi @@ -633,7 +633,7 @@ tested.\n\nThis installer has been tested on Raspberry Pi OS Buster and Bullseye case ${PLAT} in Raspbian|Debian|Linuxmint) case ${OSCN} in - buster|bullseye|una|vanessa|vera|victoria|virginia) + buster|bullseye|una|vanessa|vera|victoria|virginia|wilma) ;; *) maybeOS_Support diff --git a/AmRRON-TriMode-Setup.sh b/AmRRON-TriMode-Setup.sh index d38d250..a0e6cda 100755 --- a/AmRRON-TriMode-Setup.sh +++ b/AmRRON-TriMode-Setup.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ################################################################################ - ####################### AmRRON Tri-Mode Setup v0.7 ######################### + ####################### AmRRON Tri-Mode Setup v0.7.1 ######################### ####################### Created by TB-14 ######################### ####################### 07 Mar 2024 ######################### ################################################################################ @@ -112,7 +112,7 @@ SOURCE="${BASH_SOURCE[0]}" VER=$(grep "VERSION_ID" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"') declare -A VER_MAP=(["11"]="bullseye" ["10"]="buster" ["9"]="stretch" ["8"]="jessie" ["16.04"]="xenial" \ ["14.04"]="trusty" ["18.04"]="bionic" ["18.10"]="cosmic" ["19.04"]="disco" ["19.10"]="eoan" ["20.04"]="focal" ["18"]="sara" ["18.1"]="serena" \ - ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ["20.3"]="una" ["21"]="vanessa" ["21.1"]="vera" ["21.2"]="victoria" ["21.3"]="virginia" ) + ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ["20.3"]="una" ["21"]="vanessa" ["21.1"]="vera" ["21.2"]="victoria" ["21.3"]="virginia" ["22"]="wilma") OSCN=${VER_MAP["${VER}"]} fi @@ -120,7 +120,7 @@ SOURCE="${BASH_SOURCE[0]}" case ${PLAT} in Raspbian|Debian|Linuxmint) case ${OSCN} in - buster|bullseye|una|vanessa|vera|victoria|virginia) + buster|bullseye|una|vanessa|vera|victoria|virginia|wilma) ;; *) maybeOS_Support diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index 57c8c65..bfbd954 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ################################################################################ - ####################### AmRRON Vara Setup v.0.8.1 ######################## + ####################### AmRRON Vara Setup v.0.8.2 ######################## ####################### Created by TB-14 ######################## ####################### 08 APR 2024 ######################## ################################################################################ @@ -159,7 +159,7 @@ tested.\n\nThis installer has been tested on Raspberry Pi OS Buster and Bullseye case ${PLAT} in Raspbian|Debian|Linuxmint) case ${OSCN} in - buster|bullseye|una|vanessa|vera|victoria|virginia) + buster|bullseye|una|vanessa|vera|victoria|virginia|wilma) ;; *) maybeOS_Support @@ -219,7 +219,7 @@ echo "VARA FM: ${VARAFMVER} available" VARAFMLINK=https://downloads.winlink.org/VARA%20Products/VARA%20FM%20${VARAFMVER}%20%20setup.zip echo "VARA FM URL: ${VARAFMLINK}" -VARAHFLINK=https://downloads.winlink.org/VARA%20Products/VARA%20HF%20${VARAHFVER}%20%20setup.zip +VARAHFLINK=https://downloads.winlink.org/VARA%20Products/VARA%20HF%20${VARAHFVER}%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)') @@ -294,16 +294,6 @@ export WINEARCH=win32 sudo apt install -y wine-stable winetricks || { ERRCODE="Failed to install wine-stable and winetricks"; errors; return; } -#install with wintricks -#winetricks winxp || -#{ ERRCODE="Failed to set winetricks winxp"; errors; return; } -#winetricks sound=pulse || -#{ ERRCODE="Failed to set winetricks sound=pulse"; errors; return; } -#winetricks vb6run || -#{ ERRCODE="Failed to set winetricks vb6run"; errors; return; } -#winetricks -q vcrun2015 || -#{ ERRCODE="Failed to set winetricks -q vcrun2015"; errors; return; } - ### Version 2 attempt DISPLAY=0 WINEARCH=win32 wine wineboot || { ERRCODE="Failed to set winearch=win32 and wineboot"; errors; return; } @@ -338,11 +328,21 @@ sudo apt install -y curl p7zip-full || fi +#Install Driver +cd $HOME/Downloads && wget http://files.k6eta.com/pdh.dll.zip || +{ ERRCODE="Failed to download k6eta pdh.dll drivers"; errors; return; } +unzip pdh.dll.zip && rm pdh.dll.zip || +{ ERRCODE="Failed to unzip k6eta drivers"; errors; return; } +mv pdh.dll $HOME/.wine/drive_c/windows/system32 || +{ ERRCODE="Failed to move drivers to $HOME/.wine/drive_c/windows/system32"; errors; return; } + + + cd $HOME/Downloads wget ${VARAHFLINK} || -{ ERRCODE="Failed to download VARA HF"; errors; return; } +{ ERRCODE="Failed to download VARA HF. Visit https://downloads.winlink.org/ to download appropriate file. Unzip this file and install from terminal using the command: wine "; errors; return; } wget ${VARAFMLINK} || -{ ERRCODE="Failed to download VARA FM"; errors; return; } +{ ERRCODE="Failed to download VARA FM. Visit https://downloads.winlink.org/ to download appropriate file. Unzip this file and install from terminal using the command: wine "; errors; return; } unzip VARA\ FM\ $VARAFMVER*.zip || @@ -365,14 +365,6 @@ rm VARA\ FM\ $VARAFMVER*.zip VARA\ HF\ $VARAHFVER*.zip || #VARA\ Chat\ $VARACHAT #/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 || -{ ERRCODE="Failed to download k6eta pdh.dll drivers"; errors; return; } -unzip pdh.dll.zip && rm pdh.dll.zip || -{ ERRCODE="Failed to unzip k6eta drivers"; errors; return; } -mv pdh.dll $HOME/.wine/drive_c/windows/system32 || -{ ERRCODE="Failed to move drivers to $HOME/.wine/drive_c/windows/system32"; errors; return; } - } function installrmsexpress() { diff --git a/changelogs/CHANGELOG-Vara-setup.md b/changelogs/CHANGELOG-Vara-setup.md index 4a72666..7450ed0 100644 --- a/changelogs/CHANGELOG-Vara-setup.md +++ b/changelogs/CHANGELOG-Vara-setup.md @@ -1,3 +1,5 @@ +# Version 0.8.2 +- Modified Vara HF download link. Moved DLL download to prior to VARA download in case link breaks. # Version 0.8.1 - Again modified link address due to extra spaces input in filename. # Version 0.8