diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index aa41ce6..fa555c5 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -461,7 +461,7 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ if hash lsb_release 2>/dev/null; then PLAT=$(lsb_release -si) - OSCN=$(lsb_release -sc) # We want this to be trusty xenial bionic cosmic; jessie strech buster; sara serena sonya sylvia tara tessa + OSCN=$(lsb_release -sc) # We want this to be trusty xenial bionic cosmic disco; jessie strech buster; sara serena sonya sylvia tara tessa else # else get info from os-release @@ -469,7 +469,7 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ | awk '{print $1}') 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" ["18"]="sara" ["18.1"]="serena" \ + ["14.04"]="trusty" ["18.04"]="bionic" ["18.10"]="cosmic" ["19.04"]="disco" ["18"]="sara" ["18.1"]="serena" \ ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ) OSCN=${VER_MAP["${VER}"]} @@ -478,7 +478,7 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ case ${PLAT} in Ubuntu|Raspbian|Debian|LinuxMint) case ${OSCN} in - trusty|xenial|bionic|cosmic|jessie|stretch|buster|sara|serena|sonya|sylvia|tara|tessa) + trusty|xenial|bionic|cosmic|disco|jessie|stretch|buster|sara|serena|sonya|sylvia|tara|tessa) ;; *) maybeOS_Support @@ -1208,7 +1208,7 @@ fi else - if [[ $OSCN =~ (tara|tessa|bionic|cosmic|stretch|buster) ]]; then + if [[ $OSCN =~ (tara|tessa|bionic|cosmic|disco|stretch|buster) ]]; then echo "Getting dependencies" sudo apt-get -y install libqt5multimedia5-plugins libqt5serialport5 libqt5printsupport5 \ @@ -1280,7 +1280,7 @@ function js8call_install() { if [[ ${PLAT} = "Raspbian" ]]; then SYS=$"armhf" elif [[ $(uname -m) = x86_64 ]]; then - if [[ $OSCN =~ (tara|tessa|bionic|cosmic) ]]; then + if [[ $OSCN =~ (tara|tessa|bionic|cosmic|disco) ]]; then SYS=$"18.04_amd64" elif [[ $OSCN =~ (sara|serena|sonya|sylvia|trusty|xenial) ]]; then SYS=$"16.04_amd64" @@ -1904,7 +1904,7 @@ fi echo "Electrum is already at the Version $NEWELECTRUM" else - if [[ $OSCN =~ (tara|tessa|bionic|cosmic) ]]; then + if [[ $OSCN =~ (tara|tessa|bionic|cosmic|disco|buster) ]]; then echo "Getting dependencies" sudo apt-get install -y python3-setuptools python3-pyqt5 python3-pip || { ERRCODE="Failed to get dependencies for Electrum"; errors; return; }