From 0995e8813e4381e78ee942684717f71562772b3f Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Fri, 3 Feb 2023 12:55:42 -0800 Subject: [PATCH] Fix install script and mark it as working. --- README.md | 4 +--- install.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 707ae09..43663df 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,11 @@ server. ## Installation -**These directions won't work for the time being.** - The following command downloads and runs a script that will fetch the latest update manifest, and install all plugins available. It can also be used to update plugins to the latest version available. ```bash # Always validate the contents of a script from the internet! -bash -c "$(curl -sL https://git.mystic.run/minecraft/foundation/-/raw/main/install.sh)" +bash -c "$(curl -sL https://github.com/GayPizzaSpecifications/foundation/raw/main/install.sh)" ``` diff --git a/install.sh b/install.sh index 039c7b5..30f8ad9 100644 --- a/install.sh +++ b/install.sh @@ -7,8 +7,8 @@ echo # Ensure curl and jq are installed. if ! hash curl jq &> /dev/null; then - echo "curl and jq must be installed" - exit 1 + echo "curl and jq must be installed" + exit 1 fi echo "Installing..." @@ -20,11 +20,10 @@ if [ ! -d plugins ]; then fi # Base GitLab update manifest. -base_url="https://git.mystic.run/minecraft/foundation/-/jobs/artifacts/main/raw/" -query_params="job=build" +base_url="https://artifacts.gay.pizza/foundation/" # Download the update manifest. -manifest=$(curl -Ls "$base_url/build/manifests/update.json?$query_params") +manifest=$(curl --fail -Ls "$base_url/build/manifests/update.json" || (echo "Failed to download manifest."; exit 1)) # Get plugins list from the manifest. plugins=$(echo "$manifest" | jq -r 'keys | .[]') @@ -40,5 +39,6 @@ do echo "Installing $plugin v$version to $dl_path" # Download the plugin and store it at the mentioned path. - curl -Ls "$base_url/$artifact_path?$query_params" --output "$dl_path" + curl --fail -Ls "$base_url/$artifact_path" --output "$dl_path" || (echo "Failed to download ${artifact_path}"; exit 1) done +