mister-devel/Updater_script_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/Updater_script_MiSTer.git synced 2026-05-24 03:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from frederic-mahe/patch-1

Browse Source 
minor refactoring
This commit is contained in:
Locutus73
2019-09-03 13:00:59 +02:00
committed by GitHub
parent c9a6918638 31a3035c76
commit 9e85cfa215
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
update.sh
View File

@@ -18,6 +18,7 @@
# You can download the latest version of this script from:
# https://github.com/MiSTer-devel/Updater_script_MiSTer
# Version 2.1.2 - 2019-08-16 - minor refactoring.
# Version 2.1.1 - 2019-06-10 - Testing Internet connectivity with github.com instead of google.com.
# Version 2.1 - 2019-02-23 - CURL RETRY OPTIONS by wesclemens, now the script has a timeout and retry logic to prevent spotty connections causing the update to lockup; thank you very much.
# Version 2.1 - 2019-02-23 - Code review by frederic-mahe, now the script is more standardized and elegant, thank you very much; ALLOW_INSECURE_SSH renamed to ALLOW_INSECURE_SSL.
@@ -26,7 +27,9 @@
# ========= OPTIONS ==================
SCRIPT_URL="https://github.com/MiSTer-devel/Updater_script_MiSTer/blob/master/mister_updater.sh"
URL="https://github.com"
SCRIPT_URL="${URL}/MiSTer-devel/Updater_script_MiSTer/blob/master/mister_updater.sh"
CURL_RETRY="--connect-timeout 15 --max-time 120 --retry 3 --retry-delay 5 --silent"
# ========= ADVANCED OPTIONS =========
# ALLOW_INSECURE_SSL="true" will check if SSL certificate verification (see https://curl.haxx.se/docs/sslcerts.html )
@@ -37,8 +40,6 @@ SCRIPT_URL="https://github.com/MiSTer-devel/Updater_script_MiSTer/blob/master/mi
# any download will fail.
ALLOW_INSECURE_SSL="true"
CURL_RETRY="--connect-timeout 15 --max-time 120 --retry 3 --retry-delay 5"
# ========= CODE STARTS HERE =========
# get the name of the script, or of the parent script if called through a 'curl ... | bash -'
ORIGINAL_SCRIPT_PATH="${0}"
@@ -56,9 +57,9 @@ if [[ -f "${INI_PATH}" ]] ; then
rm -f ${TMP}
fi
# test network and https by pinging the most available website
# test network and https by pinging the target website
SSL_SECURITY_OPTION=""
curl ${CURL_RETRY} --silent https://github.com > /dev/null 2>&1
curl ${CURL_RETRY} "${URL}" > /dev/null 2>&1
case $? in
0)
;;
@@ -91,7 +92,6 @@ curl \
${SSL_SECURITY_OPTION} \
--fail \
--location \
--silent \
"${SCRIPT_URL}?raw=true" | \
bash -