Skip to content

Fix GitHub fallback issues (#2771) #2781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enoch85 merged 1 commit into from
Nov 4, 2025
Merged

Fix GitHub fallback issues (#2771) #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,15 +625,15 @@ fi
rm -f "$3"/"$2"
if [ -n "$download_script_function_in_use" ]
then
if ! curl -sfL "$1"/"$2" -o "$3"/"$2"
if ! curl -sfL --max-time 10 --connect-timeout 5 "$1"/"$2" -o "$3"/"$2"
then
# Try Statically.io CDN if this is a GitHub URL
if [[ "$1" == *"raw.githubusercontent.com"* ]]
then
local cdn_url="${1/raw.githubusercontent.com/cdn.statically.io\/gh}"
cdn_url="${cdn_url//\/nextcloud\/vm\//\/nextcloud\/vm\/main\/}"
if curl -sfL "$cdn_url"/"$2" -o "$3"/"$2"
if curl -sfL --max-time 10 --connect-timeout 5 "$cdn_url"/"$2" -o "$3"/"$2"
then
print_text_in_color "$IGreen" "✓ Used Statically.io CDN"
return 0
fi
fi
Expand All @@ -650,8 +650,7 @@ fi
if [[ "$1" == *"raw.githubusercontent.com"* ]]
then
local cdn_url="${1/raw.githubusercontent.com/cdn.statically.io\/gh}"
cdn_url="${cdn_url//\/nextcloud\/vm\//\/nextcloud\/vm\/main\/}"
if curl -sfL "$cdn_url"/"$2" -o "$3"/"$2"
if curl -sfL --max-time 10 --connect-timeout 5 "$cdn_url"/"$2" -o "$3"/"$2"
then
print_text_in_color "$IGreen" "✓ Used Statically.io CDN"
break
Expand All @@ -671,7 +670,7 @@ fi
fi
fi
fi
if ! curl -sfL "$1"/"$2" -o "$3"/"$2"
if ! curl -sfL --max-time 10 --connect-timeout 5 "$1"/"$2" -o "$3"/"$2"
then
msg_box "We just tried to fetch '$1/$2', but it seems like the server for the download isn't reachable, or that a temporary error occurred. We will now try again.
Please report this issue to $ISSUES"
Expand Down Expand Up @@ -2357,8 +2356,9 @@ try_local_backup() {

# Convert URL to local path
# https://raw.githubusercontent.com/nextcloud/vm/main/apps/script.sh -> apps/script.sh
# https://raw.githubusercontent.com/nextcloud/vm/main -> (empty, root level)
local path_part
path_part=$(echo "$url" | sed 's|https://raw.githubusercontent.com/nextcloud/vm/main/||' | sed 's|https://raw.githubusercontent.com/nextcloud/vm/master/||')
path_part=$(echo "$url" | sed 's|https://raw.githubusercontent.com/nextcloud/vm/main||' | sed 's|https://raw.githubusercontent.com/nextcloud/vm/master||' | sed 's|^/||')

# If path_part is empty, we're downloading from root
if [ -z "$path_part" ]
Expand Down
1 change: 1 addition & 0 deletions static/fetch_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ true

IRed='\e[0;91m' # Red
IGreen='\e[0;92m' # Green
IYellow='\e[0;93m' # Yellow
ICyan='\e[0;96m' # Cyan
Color_Off='\e[0m' # Text Reset
print_text_in_color() {
Expand Down