From 68e9e77380b290ee02f5f4d471b1325a3896f4df Mon Sep 17 00:00:00 2001 From: icenine451 Date: Tue, 13 Jun 2023 14:53:04 -0400 Subject: [PATCH] Add multiple online target checks --- functions/checks.sh | 18 ++++++++++++------ functions/global.sh | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/functions/checks.sh b/functions/checks.sh index 5e8e5002..ca2e38ed 100644 --- a/functions/checks.sh +++ b/functions/checks.sh @@ -5,18 +5,24 @@ check_network_connectivity() { # USAGE: if [[ $(check_network_connectivity) == "true" ]]; then ( - local response=$(wget --spider -t 1 $remote_network_target) + local response= + + if [[ ! -z $(wget --spider -t 1 $remote_network_target_1 | grep "HTTP response 200") ]]; then + local network_connnected="true" + elif [[ ! -z $(wget --spider -t 1 $remote_network_target_2 | grep "HTTP response 200") ]]; then + local network_connnected="true" + elif [[ ! -z $(wget --spider -t 1 $remote_network_target_3 | grep "HTTP response 200") ]]; then + local network_connnected="true" + else + local network_connnected="false" + fi ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Network Check" \ --text="Verifying network connectivity..." - if [[ ! -z $(echo "$response" | grep "HTTP response 200") ]]; then - echo "true" - else - echo "false" - fi + echo "$network_connected" } check_desktop_mode() { diff --git a/functions/global.sh b/functions/global.sh index a5921f6c..38a986b1 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -37,7 +37,9 @@ default_sd="/run/media/mmcblk0p1" hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) rd_repo="https://github.com/XargonWan/RetroDECK" # The URL of the main RetroDECK GitHub repo es_themes_list="https://gitlab.com/es-de/themes/themes-list/-/raw/master/themes.json" # The URL of the ES-DE 2.0 themes list -remote_network_target="https://flathub.org" # The URL of a common internet target for testing network access +remote_network_target_1="https://flathub.org" # The URL of a common internet target for testing network access +remote_network_target_2="$rd_repo" # The URL of a common internet target for testing network access +remote_network_target_3="https://one.one.one.one" # The URL of a common internet target for testing network access helper_files_folder="$emuconfigs/defaults/retrodeck/helper_files" # The parent folder of RetroDECK documentation files for deployment helper_files_list="$emuconfigs/defaults/retrodeck/reference_lists/helper_files_list.cfg" # The list of files to be deployed and where they go rd_appdata="/app/share/appdata/net.retrodeck.retrodeck.appdata.xml" # The shipped appdata XML file for this version