From 294ada5b38c3521160276c72bcd696ea6c8f77a9 Mon Sep 17 00:00:00 2001 From: tb14 Date: Tue, 1 Jul 2025 01:02:14 -0500 Subject: [PATCH] check internet status; preliminary popOS support; cleaning up info menus --- AmRRON-Setup-Script.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 8a7c75f..555873c 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -439,9 +439,12 @@ if ! hash curl 2>/dev/null; then sudo apt-get install -y curl > /dev/null 2>&1 fi -if ! ping -c 1 google.com 2>/dev/null; then +echo -e ${ACTION}Checking internet availability${NOCOLOR} +if ! ping -c 1 google.com > /dev/null 2>&1; then echo -e ${ERROR}No internet. Skipping version checks.${NOCOLOR} return +else + echo -e ${READY}Internet confirmed${NOCOLOR} fi echo -e ${ACTION}"Gathering updates available..."${NOCOLOR} @@ -613,7 +616,7 @@ function noOS_Support() { yad --image=$DIR/images/corps-icon.png --center --no-buttons \ --title "INVALID OS DETECTED" \ --text "A valid OS was not detected.\n\nThis installer was designed for \ -Debian based distros; specifically Raspberry Pi OS Buster and Bullseye (32bit and 64bit), Linux Mint 20.3 and 21." \ +Debian based distros; specifically Linux Mint 22.1" \ ${r} ${c} exit 1 @@ -623,11 +626,11 @@ 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 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 +tested.\n\nThis installer is currently being tested for operation on Linux Mint 22.1 \n\n \ +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 \ + --text "::: Did not detect properly supported OS but,\n\n \ ::: Continuing installation at user's own risk..." ${r} ${c} || { echo "exiting"; exit 1; } else @@ -659,9 +662,9 @@ function check_os_support() { fi case ${PLAT} in - Raspbian|Debian|Linuxmint) + Raspbian|Debian|Linuxmint|Pop) case ${OSCN} in - buster|bullseye|una|vanessa|vera|victoria|virginia|wilma|xia) + virginia|wilma|xia) ;; *) maybeOS_Support @@ -673,7 +676,7 @@ function check_os_support() { ;; esac -###Determine if we have a Pi4 + } ###