bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Catch download failures in download()

Browse Source
This commit is contained in:
Bryan Roessler
2024-11-04 11:07:19 -05:00
parent 2c53ec9f41
commit a130da3e26
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
installJRMC
View File

@@ -20,6 +20,7 @@ declare -g MC_REPO="bullseye" # should match the MC_VERSION
declare -g MC_VERSION="33.0.37" # Do find all replace declare -g MC_VERSION="33.0.37" # Do find all replace
declare -g BOARD_URL="https://yabb.jriver.com/interact/index.php/board,86.0.html" # MC33 declare -g BOARD_URL="https://yabb.jriver.com/interact/index.php/board,86.0.html" # MC33
declare -ig UPDATE_SWITCH=1 # set to 0 to disable automatic self-update declare -ig UPDATE_SWITCH=1 # set to 0 to disable automatic self-update
declare -g SCRIPT_URL="https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC"
# @description Print help text # @description Print help text
print_help() { print_help() {
@@ -1553,11 +1554,10 @@ update() {
after_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD) after_pull_hash=$(git -C "$SCRIPT_DIR" rev-parse HEAD)
[[ "$before_pull_hash" == "$after_pull_hash" ]] && return 0 [[ "$before_pull_hash" == "$after_pull_hash" ]] && return 0
else # Download the latest version of the script else # Download the latest version of the script
local script_url="https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC"
local tmp; tmp=$(mktemp) local tmp; tmp=$(mktemp)
# Acquire latest version # Acquire latest version
download "$script_url" "$tmp" || return 1 download "$SCRIPT_URL" "$tmp" || return 1
# Get latest version number # Get latest version number
local remote_version local remote_version
@@ -1713,12 +1713,12 @@ download() {
fi fi
if [[ ${download_cmd[0]} == "wget" ]]; then if [[ ${download_cmd[0]} == "wget" ]]; then
"${download_cmd[@]}" --output-document="${output:--}" "$url" "${download_cmd[@]}" --output-document="${output:--}" "$url" || return 1
elif [[ ${download_cmd[0]} == "curl" ]]; then elif [[ ${download_cmd[0]} == "curl" ]]; then
if [[ -n "$output" ]]; then if [[ -n "$output" ]]; then
"${download_cmd[@]}" --output "$output" "$url" "${download_cmd[@]}" --output "$output" "$url" || return 1
else else
"${download_cmd[@]}" "$url" "${download_cmd[@]}" "$url" || return 1
fi fi
else else
err "Unsupported download command: ${download_cmd[*]}" err "Unsupported download command: ${download_cmd[*]}"