Skip to content
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.

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

Allow use of curl instead of wget for build #67

Closed
heitbaum opened this issue Oct 20, 2024 · 3 comments
Closed

Allow use of curl instead of wget for build #67

heitbaum opened this issue Oct 20, 2024 · 3 comments

Comments

@heitbaum
Copy link

heitbaum commented Oct 20, 2024

Could the build scripts be updated to optionally allow curl instead of wget

--- a/backends/platform/libretro/scripts/bundle_datafiles.sh    2024-02-12 22:13:53.000000000 +0000
+++ b/backends/platform/libretro/scripts/bundle_datafiles.sh    2024-10-20 11:20:58.695910358 +0000
@@ -108,7 +108,12 @@
 if [ ! $3 = "bundle" ]; then
 
 # Update from libretro ScummVM.dat
-wget -NO "$BUILD_PATH"/ScummVM.dat https://raw.githubusercontent.com/libretro/libretro-database/master/dat/ScummVM.dat
+if command -v wget >/dev/null; then
+  wget -NO "$BUILD_PATH"/ScummVM.dat https://raw.githubusercontent.com/libretro/libretro-database/master/dat/ScummVM.dat
+else
+  # if wget is not available use curl
+  curl -f -o "$BUILD_PATH"/ScummVM.dat https://raw.githubusercontent.com/libretro/libretro-database/master/dat/ScummVM.dat
+fi
 [ -f "$BUILD_PATH"/ScummVM.dat ] && SUPPORTED_EXTENSIONS="$(cat $BUILD_PATH/ScummVM.dat | grep 'rom (' | sed -e 's/\" .*//g' -e 's
/.*\.//g' | sort -u | tr '\n' '|')" || SUPPORTED_EXTENSIONS="$ALLOWED_EXT"
 
        # Create core.info file
@spleen1981
Copy link
Collaborator

Can you submit a PR to the staging_master branch for the patch above?
Not sure why you are mentioning also dists/emscripten/build.sh, but any change to that should be submitted to the upstream scummvm/scummvm repo.

@heitbaum
Copy link
Author

heitbaum commented Oct 21, 2024

Can you submit a PR to the staging_master branch for the patch above? Not sure why you are mentioning also dists/emscripten/build.sh, but any change to that should be submitted to the upstream scummvm/scummvm repo.

Thanks. I think only bundle_datafiles.sh is required. I’ll raise the PR shortly.

@spleen1981
Copy link
Collaborator

merged in master 8dffadf

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants