diff --git a/scripts/generate_changelog.sh b/scripts/generate_changelog.sh index 81cddfb..d2261f1 100644 --- a/scripts/generate_changelog.sh +++ b/scripts/generate_changelog.sh @@ -32,7 +32,7 @@ function lookup_email_username() { # Get a pretty list of supported Minecraft versions function get_minecraft_versions() { - versions=$(. ./scripts/get_spigot_versions.sh) + readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)" for version in "${versions[@]}"; do # Append comma if variable is set, then append version diff --git a/scripts/get_spigot_versions.sh b/scripts/get_spigot_versions.sh index 64c2fea..e524912 100644 --- a/scripts/get_spigot_versions.sh +++ b/scripts/get_spigot_versions.sh @@ -15,28 +15,21 @@ # along with this program. If not, see . # +# TODO FIGURE OUT AND REMOVE WHEN LESS STRESS +hacky_versions=("1.16.5-R0.1-SNAPSHOT" "1.17-R0.1-SNAPSHOT") +for hacky_version in "${hacky_versions[@]}"; do + echo "$hacky_version" +done + +exit 0 + # Note that this script is designed for use in GitHub Actions, and is not # particularly robust nor configurable. Run from project parent directory. -# Use a nameref as a cache - maven evaluation is pretty slow. -# Re-calling the script and relying on it to handle caching is way easier than passing around info. -declare -a spigot_versions - -# We don't care about concatenation - either it's not null and we return or it's null and we instantiate. -# shellcheck disable=SC2199 -if [[ ${spigot_versions[@]} ]]; then - for spigot_version in "${spigot_versions[@]}"; do - echo "$spigot_version" - done - return -fi - # Pull Spigot dependency information from Maven. # Since we only care about Spigot versions, only check modules in the folder internal. readarray -t modules <<< "$(mvn help:evaluate -Dexpression=project.modules -q -DforceStdout -P all | grep -oP '(?<=)(internal/.*)(?=)')" -declare -n versions="spigot_versions" - for module in "${modules[@]}"; do # Get number of dependencies declared in pom of specified internal module. max_index=$(mvn help:evaluate -Dexpression=project.dependencies -q -DforceStdout -P all -pl "$module" | grep -c "") diff --git a/scripts/install_spigot_dependencies.sh b/scripts/install_spigot_dependencies.sh index 84fce3f..0beac8f 100644 --- a/scripts/install_spigot_dependencies.sh +++ b/scripts/install_spigot_dependencies.sh @@ -30,8 +30,8 @@ get_buildtools () { wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O $buildtools } -versions=$(. ./scripts/get_spigot_versions.sh) -echo Found Spigot dependencies: "$versions" +readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)" +echo Found Spigot dependencies: "${versions[@]}" for version in "${versions[@]}"; do set -e diff --git a/scripts/set_curseforge_env.sh b/scripts/set_curseforge_env.sh index f21dd40..09f08b4 100644 --- a/scripts/set_curseforge_env.sh +++ b/scripts/set_curseforge_env.sh @@ -20,7 +20,7 @@ # Parse Spigot dependency information into major Minecraft versions function get_curseforge_minecraft_versions() { - versions=$(. ./scripts/get_spigot_versions.sh) + readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)" for version in "${versions[@]}"; do # Parse Minecraft major version