This commit is contained in:
tb14
2025-10-04 16:36:51 -05:00
parent ca34b24b1d
commit 74e2b5ac52
6 changed files with 29 additions and 22 deletions
+12 -12
View File
@@ -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