diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index b79281e..6378745 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1776,7 +1776,7 @@ function amrronforms_install() { function comstat_install() { -if [[ $OSCN =~ una|vanessa|vera|virginia|wilma ]]; then +if [[ $OSCN =~ una|vanessa|vera|virginia|wilma|xia ]]; then cd $USERDIR && git clone https://github.com/W5DMH/commstatone.git || { ERRCODE="Failed to download comstat archive"; errors; return; } @@ -1790,7 +1790,7 @@ else fi -if [[ $OSCN = wilma ]]; then +if [[ $OSCN =~ wilma|xia ]]; then cd ~/Radio/commstatone && sudo apt install -y python3.12-venv || { ERRCODE="Failed to install python3.12-venv virtual environment dependencies"; errors; return; } @@ -1822,7 +1822,7 @@ fi if [[ -f $USERDIR/commstatone/commstat.py ]]; then - if [[ $OSCN = wilma ]]; then + if [[ $OSCN =~ wilma|xia ]]; then echo "[Desktop Entry] Name=CommstatOne GenericName=CommstatOne @@ -2381,7 +2381,7 @@ fi if [[ -f $USERDIR/commstatone/commstat.py ]]; then - if [[ $OSCN = wilma ]]; then + if [[ $OSCN =~ wilma|xia ]]; then echo "[Desktop Entry] Name=CommstatOne GenericName=CommstatOne @@ -3185,7 +3185,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) ]]; then + elif [[ $OSCN =~ (wilma|xia) ]]; then VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC}/+download/veracrypt-${NEWVC}-Ubuntu-24.04-${SYS}.deb" elif [[ $OSCN =~ (vanessa|vera|victoria|virginia) ]]; then @@ -3214,7 +3214,7 @@ VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $8}') cd $SECDIR && wget -N ${VCLINK} || { ERRCODE="Failed to download Veracrypt"; errors; return; } - if [[ $OSCN = "wilma" ]]; then + if [[ $OSCN =~ wilma|xia ]]; then sudo apt-get install -y libccid pcscd else diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index 827f2df..4d38254 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -324,7 +324,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) ]]; then +elif [[ $OSCN =~ (vera|vanessa|victoria|virginia|wilma|xia) ]]; then sudo apt install -y curl p7zip-full winbind|| { ERRCODE="Failed to install dependencies for pulling vara installation files"; errors; return; } @@ -363,7 +363,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) ]]; then +elif [[ $OSCN =~ (vera|vanessa|victoria|virginia|wilma|xia) ]]; then sudo apt install -y curl p7zip-full winbind|| { ERRCODE="Failed to install dependencies for pulling vara installation files"; errors; return; } @@ -399,7 +399,7 @@ unzip VARA\ FM\ $VARAFMVER*.zip || function install_varac() { -if [[ $OSCN = wilma ]]; then +if [[ $OSCN =~ wilma|xia ]]; 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 771b1f5..29b51f3 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,5 @@ +# Version 0.9.5 +- Fixing issues with Mint 22.1 support # Version 0.9.4 - added Mint 22.1 to the supported list # Version 0.9.3 diff --git a/changelogs/CHANGELOG-Vara-setup.md b/changelogs/CHANGELOG-Vara-setup.md index 7beef5d..0e243c2 100644 --- a/changelogs/CHANGELOG-Vara-setup.md +++ b/changelogs/CHANGELOG-Vara-setup.md @@ -1,3 +1,5 @@ +# Version 0.9.3 +- Fixing issues with Mint 22.1 support # Version 0.9.2 - added Mint 22.1 to the supported list # Version 0.9.1