From 74e2b5ac528bce7ab3eaecc1909aeb4fd8d7fb6a Mon Sep 17 00:00:00 2001 From: tb14 Date: Sat, 4 Oct 2025 16:36:51 -0500 Subject: [PATCH] various --- AmRRON-Setup-Script.sh | 24 ++++++++++++------------ AmRRON-TriMode-Setup.sh | 4 ++-- AmRRON-Vara-setup.sh | 16 ++++++++-------- changelogs/CHANGELOG-Setup-Script.md | 2 ++ changelogs/CHANGELOG-TriMode.md | 3 +++ changelogs/CHANGELOG-Vara-setup.md | 2 ++ 6 files changed, 29 insertions(+), 22 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index c391b38..d24a8d6 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v1.2.8 ######################## +######################## AmRRON Setup Script v1.2.9 ######################## ######################## Created by TB-14 ######################## -######################## 12 AUG 2025 ######################## +######################## 04 OCT 2025 ######################## ################################################################################ ################################################################################ # @@ -655,7 +655,7 @@ function check_os_support() { 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" ["22"]="wilma" ["22.1"]="xia" ["24.04"]="noble" ["25.04"]="plucky" ) + ["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" ["22.1"]="xia" ["22.2"]="zara" ["24.04"]="noble" ["25.04"]="plucky" ) OSCN=${VER_MAP["${VER}"]} fi @@ -663,7 +663,7 @@ function check_os_support() { case ${PLAT} in Raspbian|Debian|Linuxmint|Pop|Ubuntu) case ${OSCN} in - virginia|wilma|xia|noble|plucky) + virginia|wilma|xia|zara|noble|plucky) ;; *) maybeOS_Support @@ -1553,7 +1553,7 @@ fi function pipewire() { -if [[ $OSCN =~ wilma|xia|noble|plucky ]]; then +if [[ $OSCN =~ wilma|xia|zara|noble|plucky ]]; then sudo apt purge -y pipewire pipewire-bin || { ERRCODE="Failed to purge pipewire"; errors; return; } @@ -1727,7 +1727,7 @@ function amrronforms_install() { function comstat_install() { -if [[ $OSCN =~ una|vanessa|vera|virginia|wilma|xia|noble|plucky ]]; then +if [[ $OSCN =~ una|vanessa|vera|virginia|wilma|xia|zara|noble|plucky ]]; then if [[ -d $USERDIR/commstatone ]];then cd $USERDIR/commstatone && git pull || @@ -1747,7 +1747,7 @@ cd $USERDIR/commstatone && chmod +x linuxinstall.sh || fi fi -if [[ $OSCN =~ wilma|xia|noble|plucky ]]; then +if [[ $OSCN =~ wilma|xia|zara|noble|plucky ]]; then if [[ -d $USERDIR/commstatone/venv/ ]]; then echo "CommstatOne already exists. Nothing done."; return @@ -1784,7 +1784,7 @@ fi if [[ -f $USERDIR/commstatone/commstat.py ]]; then - if [[ $OSCN =~ wilma|xia|noble|plucky ]]; then + if [[ $OSCN =~ wilma|xia|zara|noble|plucky ]]; then echo "[Desktop Entry] Name=CommstatOne GenericName=CommstatOne @@ -1932,7 +1932,7 @@ if dpkg -s gpsd &>/dev/null && dpkg -s gpsd-clients &>/dev/null && dpkg -s chron echo "Already installed" else -if [[ $OSCN =~ (bullseye|vanessa|vera|wilma|xia|noble|plucky) ]]; then +if [[ $OSCN =~ (bullseye|vanessa|vera|wilma|xia|zara|noble|plucky) ]]; then sudo apt install -y gpsd gpsd-clients chrony gpsd-tools || { ERRCODE="Failed to install gpsd related packages"; errors; return; } @@ -2392,7 +2392,7 @@ fi if [[ -f $USERDIR/commstatone/commstat.py ]]; then - if [[ $OSCN =~ wilma|xia|noble|plucky ]]; then + if [[ $OSCN =~ wilma|xia|zara|noble|plucky ]]; then echo "[Desktop Entry] Name=CommstatOne GenericName=CommstatOne @@ -3312,7 +3312,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 =~ (wilma|xia|noble|plucky) ]]; then + elif [[ $OSCN =~ (wilma|xia|zara|noble|plucky) ]]; then VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-24.04-${SYS}.deb" elif [[ $OSCN =~ (vanessa|vera|victoria|virginia) ]]; then @@ -3341,7 +3341,7 @@ VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $8}') cd $SECDIR && wget -N ${VCLINK} || { ERRCODE="Failed to download Veracrypt"; errors; return; } - if [[ $OSCN =~ wilma|xia|noble|plucky ]]; then + if [[ $OSCN =~ wilma|xia|zara|noble|plucky ]]; then sudo apt-get install -y libccid pcscd else diff --git a/AmRRON-TriMode-Setup.sh b/AmRRON-TriMode-Setup.sh index 3597b96..241e18a 100755 --- a/AmRRON-TriMode-Setup.sh +++ b/AmRRON-TriMode-Setup.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ - ####################### AmRRON Tri-Mode Setup v0.7.3 ######################### + ####################### AmRRON Tri-Mode Setup v0.7.4 ######################### ####################### Created by TB-14 ######################### - ####################### 27 JAN 2025 ######################### + ####################### 04 OCT 2025 ######################### ################################################################################ ################################################################################ diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index 5f72bda..74094c1 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ - ####################### AmRRON Vara Setup v.1.2.3 ###################### + ####################### AmRRON Vara Setup v.1.2.4 ###################### ####################### Created by TB-14 ###################### - ####################### 06 JUL 2025 ###################### + ####################### 04 OCT 2025 ###################### ################################################################################ ################################################################################ @@ -185,7 +185,7 @@ tested.\n\nThis installer has been tested on Linux Mint 21.3 and 22. It should 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" ["22"]="wilma" ["22.1"]="xia" ["24.04"]="noble" ["25.04"]="plucky" ) + ["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" ["22.1"]="xia" ["22.2"]="zara" ["24.04"]="noble" ["25.04"]="plucky" ) OSCN=${VER_MAP["${VER}"]} fi @@ -193,7 +193,7 @@ tested.\n\nThis installer has been tested on Linux Mint 21.3 and 22. It should case ${PLAT} in Raspbian|Debian|Linuxmint|Ubuntu) case ${OSCN} in - buster|bullseye|una|vanessa|vera|victoria|virginia|wilma|xia|noble|plucky) + buster|bullseye|una|vanessa|vera|victoria|virginia|wilma|xia|zara|noble|plucky) ;; *) maybeOS_Support @@ -229,7 +229,7 @@ fi function confirm_os() { -if [[ $OSCN =~ bullseye|una|vanessa|vera|victoria|virginia|wilma|xia|noble|plucky ]]; then +if [[ $OSCN =~ bullseye|una|vanessa|vera|victoria|virginia|wilma|xia|zara|noble|plucky ]]; then echo "Continuing with install" else yad --image=$DIR/images/corps-icon.png --center \ @@ -379,7 +379,7 @@ 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; } -elif [[ $OSCN =~ (vera|vanessa|victoria|virginia|wilma|xia|noble|plucky) ]]; then +elif [[ $OSCN =~ (vera|vanessa|victoria|virginia|wilma|xia|zara|noble|plucky) ]]; then sudo apt install -y curl p7zip-full winbind|| { ERRCODE="Failed to install dependencies for pulling vara installation files"; errors; return; } @@ -451,7 +451,7 @@ 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; } -elif [[ $OSCN =~ (vera|vanessa|victoria|virginia|wilma|xia|noble|plucky) ]]; then +elif [[ $OSCN =~ (vera|vanessa|victoria|virginia|wilma|xia|zara|noble|plucky) ]]; then sudo apt install -y curl p7zip-full winbind|| { ERRCODE="Failed to install dependencies for pulling vara installation files"; errors; return; } @@ -509,7 +509,7 @@ unzip VARA\ FM\ $VARAFMVER*.zip || function install_varac() { -if [[ $OSCN =~ wilma|xia|noble|plucky ]]; then +if [[ $OSCN =~ wilma|xia|zara|noble|plucky ]]; then if [[ ! -f $HOME/.wine/drive_c/windows/system32/pdh.dll ]]; then cd $HOME/Downloads && wget http://files.k6eta.com/pdh.dll.zip || diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index fc93d8e..cfb5272 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,5 @@ +# Version 1.2.9 +- Updated OS version support # Version 1.2.8 - fixed flmsg link issue # Version 1.2.7 diff --git a/changelogs/CHANGELOG-TriMode.md b/changelogs/CHANGELOG-TriMode.md index 02934d4..626b095 100644 --- a/changelogs/CHANGELOG-TriMode.md +++ b/changelogs/CHANGELOG-TriMode.md @@ -1,4 +1,7 @@ # Tri-Mode Setup Changelog +# Version 0.7.4 +- Updated OS version support +- Simplified Easy Button rigctld command to remove socat for stability. ARDOP testing required # Version 0.7.3 - Added git repo checking before the script runs instead of just a note. # Version 0.7.2 diff --git a/changelogs/CHANGELOG-Vara-setup.md b/changelogs/CHANGELOG-Vara-setup.md index 51d1654..5850e04 100644 --- a/changelogs/CHANGELOG-Vara-setup.md +++ b/changelogs/CHANGELOG-Vara-setup.md @@ -1,3 +1,5 @@ +# Version 1.2.4 +- Updated OS version support # Version 1.2.3 - Updated VarAC installer to V12.0.0 # Version 1.2.2