From 3d512424642a9b6f0a92101b2ccd10a3771ddc99 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 16 Jun 2020 21:14:39 -0600 Subject: [PATCH] package: remove unsupported curl options These aren't available on ubuntu 16, and using newer unbuntus mean we have to install our own java --- build_manifest.sh | 5 ++--- build_plugin.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build_manifest.sh b/build_manifest.sh index f1a3d6471..2d820933e 100755 --- a/build_manifest.sh +++ b/build_manifest.sh @@ -53,8 +53,7 @@ for PLUGINFILE in plugins/*; do MANIFEST_CHUNK_DOWNLOAD+=('--output' "$MANIFEST_DIR/$PLUGIN_ID" "$LOCATION.manifest") done -curl --fail --retry 5 --retry-connrefused \ - --parallel \ +curl --fail --retry 5 \ "${MANIFEST_CHUNK_DOWNLOAD[@]}" IS_FIRST=true @@ -75,7 +74,7 @@ perl -e "print pack('N', -s \"$MANIFEST.sig\")" > "$MANIFEST.out" cat "$MANIFEST.sig" >> "$MANIFEST.out" cat "$MANIFEST" >> "$MANIFEST.out" -curl --fail --retry 5 --retry-connrefused \ +curl --fail --retry 5 \ --user "$REPO_CREDS" \ --upload-file "$MANIFEST.out" "$REPO_ROOT/$RUNELITE_VERSION/manifest.js" diff --git a/build_plugin.sh b/build_plugin.sh index 3902cf464..aff855f20 100755 --- a/build_plugin.sh +++ b/build_plugin.sh @@ -98,7 +98,7 @@ if [ -e "icon.png" ]; then ICON_UPLOAD=("--upload-file" "icon.png" "$LOCATION.png") fi -curl --fail --retry 5 --retry-connrefused \ +curl --fail --retry 5 \ --user "$REPO_CREDS" \ --upload-file "$BUILDDIR/plugin.manifest" "$LOCATION.manifest" \ --upload-file "$BUILDDIR/plugin.jar" "$LOCATION.jar" \