mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2024-11-22 22:15:39 +00:00
Merge pull request #421 from icenine451/cooker-0.7.0b-icenine451
Cooker 0.7.0b icenine451
This commit is contained in:
commit
c82289449d
|
@ -4,13 +4,25 @@ check_network_connectivity() {
|
||||||
# This function will do a basic check for network availability and return "true" if it is working.
|
# This function will do a basic check for network availability and return "true" if it is working.
|
||||||
# USAGE: if [[ $(check_network_connectivity) == "true" ]]; then
|
# USAGE: if [[ $(check_network_connectivity) == "true" ]]; then
|
||||||
|
|
||||||
local response=$(wget --spider -t 1 $remote_network_target)
|
(
|
||||||
|
local response=
|
||||||
|
|
||||||
if [[ ! -z $(echo "$response" | grep "HTTP response 200") ]]; then
|
if [[ ! -z $(wget --spider -t 1 $remote_network_target_1 | grep "HTTP response 200") ]]; then
|
||||||
echo "true"
|
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
|
else
|
||||||
echo "false"
|
local network_connnected="false"
|
||||||
fi
|
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..."
|
||||||
|
|
||||||
|
echo "$network_connected"
|
||||||
}
|
}
|
||||||
|
|
||||||
check_desktop_mode() {
|
check_desktop_mode() {
|
||||||
|
|
|
@ -37,7 +37,9 @@ default_sd="/run/media/mmcblk0p1"
|
||||||
hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem)
|
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
|
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
|
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://one.one.one.one" # 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_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
|
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
|
rd_appdata="/app/share/appdata/net.retrodeck.retrodeck.appdata.xml" # The shipped appdata XML file for this version
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2
|
Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409
|
|
@ -1 +1 @@
|
||||||
Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed
|
Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42
|
|
@ -541,7 +541,7 @@ configurator_retrodeck_tools_dialog() {
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"RetroDECK: Change Update Check Setting" )
|
"RetroDECK: Change Update Setting" )
|
||||||
configurator_online_update_setting_dialog
|
configurator_online_update_setting_dialog
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue