Updated version checking for 21.3 Virginia. Testing updates on Vara Install script.

This commit is contained in:
tangobravo14
2024-02-26 06:59:34 +00:00
parent ef7997e8e3
commit 6ed5075472
6 changed files with 29 additions and 27 deletions
+5 -5
View File
@@ -1,9 +1,9 @@
#!/bin/bash
################################################################################
################################################################################
######################## AmRRON Setup Script v0.7.5.1 ########################
######################## AmRRON Setup Script v0.7.5.2 ########################
######################## Created by TB-14 ########################
######################## 28 MAY 23 ########################
######################## 26 Feb 2024 ########################
################################################################################
################################################################################
#
@@ -575,7 +575,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" )
["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" )
OSCN=${VER_MAP["${VER}"]}
fi
@@ -583,7 +583,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)
buster|bullseye|una|vanessa|vera|victoria|virginia)
;;
*)
maybeOS_Support
@@ -3027,7 +3027,7 @@ if [[ $VCVER == $NEWVC ]]; then
elif [[ $OSCN = "bullseye" ]]; then
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Debian-11-${SYS}.deb"
elif [[ $OSCN =~ (vanessa|vera|victoria) ]]; then
elif [[ $OSCN =~ (vanessa|vera|victoria|virginia) ]]; then
VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-22.04-${SYS}.deb"
elif [[ $OSCN =~ (ulyana|ulyssa|uma|una) ]]; then
+4 -4
View File
@@ -1,9 +1,9 @@
#!/bin/bash
################################################################################
################################################################################
####################### AmRRON Tri-Mode Setup v0.6.2 #########################
####################### AmRRON Tri-Mode Setup v0.6.3 #########################
####################### Created by TB-14 #########################
####################### 18 Oct 2022 #########################
####################### 26 Feb 2024 #########################
################################################################################
################################################################################
@@ -87,7 +87,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" )
["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" )
OSCN=${VER_MAP["${VER}"]}
fi
@@ -95,7 +95,7 @@ SOURCE="${BASH_SOURCE[0]}"
case ${PLAT} in
Raspbian|Debian|Linuxmint)
case ${OSCN} in
buster|bullseye|una|vanessa)
buster|bullseye|una|vanessa|vera|victoria|virginia)
;;
*)
maybeOS_Support
+10 -18
View File
@@ -1,9 +1,9 @@
#!/bin/bash
################################################################################
################################################################################
####################### AmRRON Vara Setup v.0.2 #########################
####################### AmRRON Vara Setup v.0.4 #########################
####################### Created by TB-14 #########################
####################### 06 NOV 2022 #########################
####################### 26 Feb 2024 #########################
################################################################################
################################################################################
@@ -129,7 +129,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" )
["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" )
OSCN=${VER_MAP["${VER}"]}
fi
@@ -137,7 +137,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)
buster|bullseye|una|vanessa|vera|victoria|virginia)
;;
*)
maybeOS_Support
@@ -194,10 +194,10 @@ echo "VARA FM: ${VARAFMVER} available"
#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)')
VARAFMLINK=$(https://downloads.winlink.org/VARA%20Products/VARA%20HF%20$VARAFMVER%20setup.zip)
echo "VARA FM URL: ${VARAFMLINK}"
VARAHFLINK=$(curl -s https://rosmodem.wordpress.com/ | grep -oP '(?=https://mega.nz).*?(?=" target="_blank" rel="noopener noreferrer">VARA HF v)')
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)')
@@ -308,27 +308,19 @@ function installvara_mint() {
if [[ $OSCN = una ]]; then
sudo apt install -y curl libcurl4-openssl-dev libssl-dev ||
{ ERRCODE="Failed to install dependencies for pulling vara installation files"; errors; return; }
cd $HOME/Downloads && wget -N https://megatools.megous.com/builds/megatools-1.10.3.tar.gz ||
{ ERRCODE="Failed to download megatools source code."; errors; return; }
tar -xzvf megatools-1.10.3.tar.gz && cd megatools-1.10.3/ ||
{ ERRCODE="Failed to extract megatools source code."; errors; return; }
./configure && make && sudo make install ||
{ ERRCODE="Failed to build megatools source code."; errors; return; }
elif [[ $OSCN = vanessa ]]; then
elif [[ $OSCN =~ (vera|vanessa|victoria|virginia) ]]; then
sudo apt install -y megatools curl p7zip-full ||
sudo apt install -y curl p7zip-full ||
{ ERRCODE="Failed to install dependencies for pulling vara installation files"; errors; return; }
fi
cd $HOME/Downloads
megadl ${VARAHFLINK} ||
wget ${VARAHFLINK} ||
{ ERRCODE="Failed to download VARA HF"; errors; return; }
megadl ${VARAFMLINK} ||
wget ${VARAFMLINK} ||
{ ERRCODE="Failed to download VARA FM"; errors; return; }
#megadl $VARACHATLINK ||
#{ ERRCODE="Failed to download VARA Chat"; errors; return; }
unzip VARA\ FM\ $VARAFMVER*.zip ||
+3
View File
@@ -1,3 +1,6 @@
# Version 0.7.5.2
- Added Linux Mint version checking for 21.1 / 21.2 / 21.3
# Version 0.7.5.1
- Added install option for Kleopatra GnuPG key manager and crypto GUI
- Changed Easy button / Security tools Install All option to choose Kleopatra instead of GPA.
+2
View File
@@ -1,4 +1,6 @@
# Tri-Mode Setup Changelog
# Version 0.6.3
- Added Linux Mint version checking for 21.1 / 21.2 / 21.3
# Version 0.6.2
- Updated OS support list
+5
View File
@@ -1,3 +1,8 @@
# Version 0.4
- Updated Linux Mint version checking through 21.3
- Updated download links to point to downloads.winlink.org
- Removed MegaDL
# Version 0.3
- Installs on Bullseye 64bit.