Fixed saving the spigot API instead of the actual server file

build-versions.sh

@@ -4,8 +4,6 @@ SCRIPT_DIR=$(dirname "$0")
 
 WORKSPACE=$(pwd)
 
-mkdir -p "$SCRIPT_DIR/build"
-
 echo "Got versions $REV"
 
 if [ -z "$M2_DIRECTORY" ]; then
@@ -13,6 +11,12 @@ if [ -z "$M2_DIRECTORY" ]; then
     M2_DIRECTORY="$SCRIPT_DIR/m2"
 fi
 
+if [ -z "$BUILD_DIRECTORY" ]; then
+    echo "build directory not specified, defaulting to $SCRIPT_DIR/build"
+    BUILD_DIRECTORY="$SCRIPT_DIR/build"
+fi
+
+mkdir -p "$BUILD_DIRECTORY"
 mkdir -p "$M2_DIRECTORY"
 
 IFS=',' read -r -a versions <<< "$REV"
@@ -95,7 +99,7 @@ if [ ! -z ${BUILD_JAVA_21+x} ]; then
         -e MAVEN_CONFIG=/var/maven/.m2 \
         -e M2_PATH=/var/maven/.m2 \
         -e REV="$BUILD_JAVA_21" \
-        --volume "$SCRIPT_DIR/build:/build" \
+        --volume "$BUILD_DIRECTORY:/build" \
         --volume "$M2_DIRECTORY:/var/maven/.m2" \
         --volume "$SCRIPT_DIR/scripts:/scripts" \
         -- docker.io/maven:3.9.11-eclipse-temurin-21 ./scripts/install-spigot.sh
@@ -114,7 +118,7 @@ if [ ! -z ${BUILD_JAVA_17+x} ]; then
         -e MAVEN_CONFIG=/var/maven/.m2 \
         -e M2_PATH=/var/maven/.m2 \
         -e REV="$BUILD_JAVA_17" \
-        --volume "$SCRIPT_DIR/build:/build" \
+        --volume "$BUILD_DIRECTORY:/build" \
         --volume "$M2_DIRECTORY:/var/maven/.m2" \
         --volume "$SCRIPT_DIR/scripts:/scripts" \
         -- docker.io/maven:3.9.11-eclipse-temurin-17 /scripts/install-spigot.sh
@@ -133,7 +137,7 @@ if [ ! -z ${BUILD_JAVA_8+x} ]; then
         -e MAVEN_CONFIG=/var/maven/.m2 \
         -e M2_PATH=/var/maven/.m2 \
         -e REV="$BUILD_JAVA_8" \
-        --volume "$SCRIPT_DIR/build:/build" \
+        --volume "$BUILD_DIRECTORY:/build" \
         --volume "$M2_DIRECTORY:/var/maven/.m2" \
         --volume "$SCRIPT_DIR/scripts:/scripts" \
         -- docker.io/maven:3.9.11-eclipse-temurin-8 /scripts/install-spigot.sh

run.sh

@@ -13,7 +13,7 @@ docker run --rm -it \
     --user $(id -u):$(id -g) \
     -e MAVEN_CONFIG=/var/maven/.m2 \
     -e M2_PATH=/var/maven/.m2 \
-    --volume "$SCRIPT_DIR/build:/build" \
+    --volume "$BUILD_DIRECTORY:/build" \
     --volume "$WORKSPACE:/workspace" \
     --volume "$M2_DIRECTORY:/var/maven/.m2" \
     --volume "$SCRIPT_DIR/scripts:/scripts" \

run_server.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ "$#" -le 1 ]; then
+if [ "$#" -lt 1 ]; then
     echo "Using default spigot version 1.21.10"
     export REV=1.21.10
 else
@@ -19,7 +19,7 @@ docker run --rm -it \
     -p 25565:25565 \
     -e MAVEN_CONFIG=/var/maven/.m2 \
     -e M2_PATH=/var/maven/.m2 \
-    --volume "$SCRIPT_DIR/build:/build" \
+    --volume "$BUILD_DIRECTORY:/build" \
     --volume "$WORKSPACE:/workspace" \
     --volume "$M2_DIRECTORY:/var/maven/.m2" \
     --volume "$SCRIPT_DIR/scripts:/scripts" \

scripts/install-spigot.sh

@@ -14,10 +14,9 @@ for ver in "${versions[@]}"; do
 
   mvn -q org.apache.maven.plugins:maven-dependency-plugin:3.9.0:get -Dartifact=org.spigotmc:spigot:${ver}-R0.1-SNAPSHOT
 
-  if [ "$?" -eq 0 ]; then
+  ARTIFACT="spigot-${ver}.jar"
+  if [ "$?" -eq 0 ] -a [ -e "/build/$ARTIFACT" ]; then
     echo "Located spigot $ver successfully"
-
-    mvn -q org.apache.maven.plugins:maven-dependency-plugin:3.9.0:copy -Dartifact=org.spigotmc:spigot:${ver}-R0.1-SNAPSHOT -DoutputDirectory=/build
   else
     echo "Spigot $ver not located, building..."
     if [ ! -d "${HOME}/buildtools" ]; then
@@ -29,8 +28,6 @@ for ver in "${versions[@]}"; do
 
     java -jar BuildTools.jar --rev "$ver"
 
-    ARTIFACT="spigot-${ver}-R0.1-SNAPSHOT.jar"
-    mv "spigot-${ver}.jar" "$ARTIFACT"
     mv "$ARTIFACT" /build
   fi
 done