From b0384971a63a8c0756c283c57ef486aef4557c4f Mon Sep 17 00:00:00 2001 From: tb14 Date: Mon, 5 Aug 2019 06:31:53 -0700 Subject: [PATCH] Tina support --- AmRRON-Setup-Script.sh | 16 ++++++++-------- AmRRON-TriMode-Setup-v2.sh | 6 +++--- changelogs/CHANGELOG-Setup-Script.md | 3 +++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 85c3184..e425c47 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,9 +1,9 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.5.5 ######################## +######################## AmRRON Setup Script v0.5.6 ######################## ######################## Created by TB-14 ######################## -######################## 20 JUL 2019 ######################## +######################## 05 Aug 2019 ######################## ################################################################################ ################################################################################ # @@ -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 disco; 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 tina else # else get info from os-release @@ -470,7 +470,7 @@ 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" ["18"]="sara" ["18.1"]="serena" \ - ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ) + ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ["19.2"]="tina" ) OSCN=${VER_MAP["${VER}"]} fi @@ -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|disco|jessie|stretch|buster|sara|serena|sonya|sylvia|tara|tessa) + trusty|xenial|bionic|cosmic|disco|jessie|stretch|buster|sara|serena|sonya|sylvia|tara|tessa|tina) ;; *) maybeOS_Support @@ -1208,7 +1208,7 @@ fi else - if [[ $OSCN =~ (tara|tessa|bionic|cosmic|stretch|buster) ]]; then + if [[ $OSCN =~ (tara|tessa|tina|bionic|cosmic|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|disco) ]]; then + if [[ $OSCN =~ (tara|tessa|tina|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|disco|buster) ]]; then + if [[ $OSCN =~ (tara|tessa|tina|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; } diff --git a/AmRRON-TriMode-Setup-v2.sh b/AmRRON-TriMode-Setup-v2.sh index 1209d4e..0ad3fd6 100755 --- a/AmRRON-TriMode-Setup-v2.sh +++ b/AmRRON-TriMode-Setup-v2.sh @@ -42,7 +42,7 @@ function maybeOS_Support() { if (yad --image=/tmp/banner.png --center \ --title "Not Supported OS" \ --text "Your OS may be compatible with this installer but has not been \ -tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ +tested.\n\nThis installer has been tested on Raspbian Stretch, Buster, Ubuntu \ 18.04, and Mint 18.3 / 19.1.\n\nWould you like to continue anyway?" ${r} ${c}) then yad --image=/tmp/banner.png --center \ --title "Not Supported OS" \ @@ -63,14 +63,14 @@ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ PLAT=$(lsb_release -si) OSCN=$(lsb_release -sc) # We want this to be trusty xenial bionic; jessie - #strech; sara serena sonya sylvia tara tessa + #strech buster; sara serena sonya sylvia tara tessa else # else get info from os-release PLAT=$(grep "^NAME" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"' \ | awk '{print $1}') VER=$(grep "VERSION_ID" /etc/os-release | awk -F "=" '{print $2}' | tr -d '"') - declare -A VER_MAP=(["9"]="stretch" ["8"]="jessie" ["16.04"]="xenial" \ + declare -A VER_MAP=(["10"]="buster" ["9"]="stretch" ["8"]="jessie" ["16.04"]="xenial" \ ["14.04"]="trusty" ["18.04"]="bionic" ["18"]="sara" ["18.1"]="serena" \ ["18.2"]="sonya" ["18.3"]="sylvia" ["19"]="tara" ["19.1"]="tessa" ) OSCN=${VER_MAP["${VER}"]} diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 5cd189a..9f2658d 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,6 @@ +# Version 0.5.6 + - Added recognition for Linux Mint 19.2 "Tina". Not tested yet for dependency support. + # Version 0.5.5 - Updated script to recognize Debian 10 for the new Raspbian OS.