diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 02b6e5b..f8e751d 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -655,15 +655,15 @@ 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" ) + ["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" ) OSCN=${VER_MAP["${VER}"]} fi case ${PLAT} in - Raspbian|Debian|Linuxmint|Pop) + Raspbian|Debian|Linuxmint|Pop|Ubuntu) case ${OSCN} in - virginia|wilma|xia) + virginia|wilma|xia|noble) ;; *) maybeOS_Support @@ -1553,7 +1553,7 @@ fi function pipewire() { -if [[ $OSCN =~ wilma|xia ]]; then +if [[ $OSCN =~ wilma|xia|noble ]]; 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 ]]; then +if [[ $OSCN =~ una|vanessa|vera|virginia|wilma|xia|noble ]]; 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 ]]; then +if [[ $OSCN =~ wilma|xia|noble ]]; 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 ]]; then + if [[ $OSCN =~ wilma|xia|noble ]]; 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) ]]; then +if [[ $OSCN =~ (bullseye|vanessa|vera|wilma|xia|noble) ]]; 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 ]]; then + if [[ $OSCN =~ wilma|xia|noble ]]; 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) ]]; then + elif [[ $OSCN =~ (wilma|xia|noble) ]]; 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 ]]; then + if [[ $OSCN =~ wilma|xia|noble ]]; then sudo apt-get install -y libccid pcscd else diff --git a/AmRRON-TriMode-Setup.sh b/AmRRON-TriMode-Setup.sh index 0279699..ae3d541 100755 --- a/AmRRON-TriMode-Setup.sh +++ b/AmRRON-TriMode-Setup.sh @@ -156,15 +156,15 @@ 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" ["22"]="wilma" ["22.1"]="xia" ) + ["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" ) OSCN=${VER_MAP["${VER}"]} fi case ${PLAT} in - Raspbian|Debian|Linuxmint) + Raspbian|Debian|Linuxmint|Ubuntu) case ${OSCN} in - buster|bullseye|una|vanessa|vera|victoria|virginia|wilma|xia) + buster|bullseye|una|vanessa|vera|victoria|virginia|wilma|xia|noble) ;; *) maybeOS_Support diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index 9a382a4..39f8e87 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -185,15 +185,15 @@ 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" ) + ["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" ) OSCN=${VER_MAP["${VER}"]} fi case ${PLAT} in - Raspbian|Debian|Linuxmint) + Raspbian|Debian|Linuxmint|Ubuntu) case ${OSCN} in - buster|bullseye|una|vanessa|vera|victoria|virginia|wilma|xia) + buster|bullseye|una|vanessa|vera|victoria|virginia|wilma|xia|noble) ;; *) maybeOS_Support @@ -229,7 +229,7 @@ fi function confirm_os() { -if [[ $OSCN =~ bullseye|una|vanessa|vera|victoria|virginia|wilma|xia ]]; then +if [[ $OSCN =~ bullseye|una|vanessa|vera|victoria|virginia|wilma|xia|noble ]]; then echo "Continuing with install" else yad --image=$DIR/images/corps-icon.png --center \ @@ -377,7 +377,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) ]]; then +elif [[ $OSCN =~ (vera|vanessa|victoria|virginia|wilma|xia|noble) ]]; then sudo apt install -y curl p7zip-full winbind|| { ERRCODE="Failed to install dependencies for pulling vara installation files"; errors; return; } @@ -449,7 +449,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) ]]; then +elif [[ $OSCN =~ (vera|vanessa|victoria|virginia|wilma|xia|noble) ]]; then sudo apt install -y curl p7zip-full winbind|| { ERRCODE="Failed to install dependencies for pulling vara installation files"; errors; return; } @@ -507,7 +507,7 @@ unzip VARA\ FM\ $VARAFMVER*.zip || function install_varac() { -if [[ $OSCN =~ wilma|xia ]]; then +if [[ $OSCN =~ wilma|xia|noble ]]; then if [[ ! -f $HOME/.wine/drive_c/windows/system32/pdh.dll ]]; then cd $HOME/Downloads && wget http://files.k6eta.com/pdh.dll.zip ||