diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 7653674..2bb2f5c 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -494,15 +494,15 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ VER=$(grep "VERSION_ID" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"') declare -A VER_MAP=(["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" ) + ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ["19.3"]="tricia" ["20"]="ulyana" ) OSCN=${VER_MAP["${VER}"]} fi case ${PLAT} in - Ubuntu|Raspbian|Debian|LinuxMint) + Ubuntu|Raspbian|Debian|LinuxMint|PureOS) case ${OSCN} in - trusty|xenial|bionic|cosmic|disco|eoan|focal|jessie|stretch|buster|sara|serena|sonya|sylvia|tara|tessa|tina|tricia) + trusty|xenial|bionic|cosmic|disco|eoan|focal|jessie|stretch|buster|sara|serena|sonya|sylvia|tara|tessa|tina|tricia|ulyana|amber) ;; *) maybeOS_Support @@ -1156,7 +1156,7 @@ function voacap_install() { makeitshfbc || { ERRCODE="VOACAPL makeitshfbc failed"; errors; return; } - if [[ $OSCN =~ (eoan|focal) ]]; then + if [[ $OSCN =~ (eoan|focal|amber|ulyana) ]]; then { echo voacap_os >> /tmp/cleanup; return; } else @@ -1234,7 +1234,7 @@ fi else - if [[ $OSCN =~ (tara|tessa|tina|tricia|bionic|eoan|focal|cosmic|stretch|buster) ]]; then + if [[ $OSCN =~ (tara|tessa|tina|tricia|bionic|eoan|focal|cosmic|stretch|buster|ulyana|amber) ]]; then echo "Getting dependencies" sudo apt-get -y install libqt5multimedia5-plugins libqt5serialport5 libqt5printsupport5 \ @@ -1322,7 +1322,7 @@ if [[ ${PLAT} = "Raspbian" ]]; then js8call_link=$(curl -s http://files.js8call.com/latest.html | grep -o "http://files.js8call.com/[0-9].[0-9].[0-9]/js8call_[0-9].[0-9].[0-9]_18.04_amd64.deb" | head -n 1) elif [[ $OSCN =~ (sara|serena|sonya|sylvia|trusty|xenial) ]]; then js8call_link=$(curl -s http://files.js8call.com/latest.html | grep -o "http://files.js8call.com/[0-9].[0-9].[0-9]/js8call_[0-9].[0-9].[0-9]_16.04_amd64.deb" | head -n 1) - elif [[ $OSCN =~ (eoan|focal) ]]; then + elif [[ $OSCN =~ (eoan|focal|amber|ulyana) ]]; then { echo js8call_os >> /tmp/cleanup; return; } fi else @@ -1956,7 +1956,7 @@ fi echo "Electrum is already at the Version $NEWELECTRUM" else - if [[ $OSCN =~ (tara|tessa|tina|tricia|bionic|cosmic|disco|eoan|focal|buster) ]]; then + if [[ $OSCN =~ (tara|tessa|tina|tricia|bionic|cosmic|disco|eoan|focal|buster|amber|ulyana) ]]; then echo "Getting dependencies" sudo apt-get install -y python3-setuptools python3-pyqt5 python3-pip || { ERRCODE="Failed to get dependencies for Electrum"; errors; return; } @@ -2427,7 +2427,7 @@ NEWVC_lower=$(echo $NEWVC | tr '[:upper:]' '[:lower:]') VCLINK=$"http://sourceforge.net/projects/veracrypt/files/Contributions/ARM%20Linux/veracrypt-1.0f-1-setup-arm.tar.bz2" - elif [[ $OSCN =~ (eoan|focal) ]]; then + elif [[ $OSCN =~ (eoan|focal|amber|ulyana) ]]; then VCLINK=$"https://launchpad.net/veracrypt/trunk/${NEWVC_lower}/+download/veracrypt-${NEWVC}-Ubuntu-19.10-amd64.deb" elif [[ $OSCN =~ (disco) ]]; then