From a830a15723608e7abc4ffa91670555da6c420e1a Mon Sep 17 00:00:00 2001 From: tb14 Date: Tue, 18 Oct 2022 16:20:20 -0500 Subject: [PATCH] Final cleanup version numbers and changelogs --- AmRRON-TriMode-Setup.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/AmRRON-TriMode-Setup.sh b/AmRRON-TriMode-Setup.sh index b3e9472..a05249a 100755 --- a/AmRRON-TriMode-Setup.sh +++ b/AmRRON-TriMode-Setup.sh @@ -3,7 +3,7 @@ ################################################################################ ####################### AmRRON Tri-Mode Setup v0.6.2 ######################### ####################### Created by TB-14 ######################### - ####################### 15 Oct 2022 ######################### + ####################### 18 Oct 2022 ######################### ################################################################################ ################################################################################ @@ -40,22 +40,22 @@ Debian based distros; specifically Raspbian Stretch, Linux Mint 18.3 / 19.1 and } function maybeOS_Support() { - if (yad --image=$DIR/images/corps-icon.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 \ -18.04, and Mint 18.3 / 19.1.\n\nWould you like to continue anyway?" ${r} ${c}) then - yad --image=$DIR/images/corps-icon.png --center \ - --title "Not Supported OS" \ - --text "::: Did not detect perfectly supported OS but,\n\n \ + if (yad --image=$DIR/images/corps-icon.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 Raspberry Pi OS Buster and Bullseye \ +(32bit and 64bit), Linux Mint 20.3 and 21. It should work on most Debian 10 / 11 based distros. \n\nWould you like to continue anyway?" ${r} ${c}) then + yad --image=$DIR/images/corps-icon.png --center \ + --title "Not Supported OS" \ + --text "::: Did not detect perfectly supported OS but,\n\n \ ::: Continuing installation at user's own risk..." ${r} ${c} || - { echo "exiting"; exit 1; } - else - yad --image=$DIR/images/corps-icon.png --center \ - --title "Not Supported OS" \ - --text "::: Exiting due to unsupported OS" ${r} ${c} - exit 1 - fi + { echo "exiting"; exit 1; } + else + yad --image=$DIR/images/corps-icon.png --center \ + --title "Not Supported OS" \ + --text "::: Exiting due to unsupported OS" ${r} ${c} + exit 1 + fi } # Determine location user is running script from. @@ -93,9 +93,9 @@ SOURCE="${BASH_SOURCE[0]}" fi case ${PLAT} in - Ubuntu|Raspbian|Debian|LinuxMint|PureOS|Linuxmint) + Raspbian|Debian|Linuxmint) case ${OSCN} in - trusty|xenial|bionic|cosmic|disco|eoan|focal|jessie|stretch|buster|bullseye|sara|serena|sonya|sylvia|tara|tessa|tina|tricia|ulyana|una|vanessa|amber) + buster|bullseye|una|vanessa) ;; *) maybeOS_Support