diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 74cb168ca..13ec7135d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,5 +29,6 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v2-preview with: - path: akarin-paperclip.jar + name: akarin launcher + path: *.jar diff --git a/akarin b/akarin index b21aef133..4b02f18a7 100755 --- a/akarin +++ b/akarin @@ -46,7 +46,7 @@ case "$1" in cd ${FORK_NAME}-API mvn -e clean install && cd ../${FORK_NAME}-Server && mvn -e clean install basedir - $scriptdir/paperclip.sh + $scriptdir/installLauncher.sh "$basedir" ) ;; "d" | "de" | "deploy") diff --git a/scripts/makeAkarinclip.sh b/scripts/installLauncher.sh similarity index 56% rename from scripts/makeAkarinclip.sh rename to scripts/installLauncher.sh index 8cab5b1a5..4a094cb9c 100644 --- a/scripts/makeAkarinclip.sh +++ b/scripts/installLauncher.sh @@ -1,12 +1,19 @@ #!/usr/bin/env bash -echo "[Akarin] State: Make Akarinclip" +# SCRIPT HEADER start +basedir=$1 +source "$basedir/scripts/functions.sh" +echo "----------------------------------------" +echo " $(bashcolor 1 32)Task$(bashcolorend) - Install Launcher" +echo " This will build a launcher that similar to Paperclip by the server jar." +echo " " +echo "----------------------------------------" +# SCRIPT HEADER end # Copied from https://github.com/PaperMC/Paper/blob/d54ce6c17fb7a35238d6b9f734d30a4289886773/scripts/paperclip.sh # License from Paper applies to this file set -e -basedir="$(cd "$1" && pwd -P)" paperworkdir="$basedir/Paper/work" mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) serverjar="$basedir/Akarin-Server/target/akarin-$mcver.jar" @@ -16,10 +23,7 @@ vanillajar="$paperworkdir/Minecraft/$mcver/$mcver.jar" cd "$paperworkdir/Paperclip" mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$serverjar" "-Dvanillajar=$vanillajar" ) -cp "$paperworkdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/akarinclip-${mcver}.jar" +cp "$paperworkdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/akarin-${mcver}-launcher.jar" echo "" -echo "" -echo "" -echo "Build success!" -echo "Copied final jar to $(cd "$basedir" && pwd -P)/akarinclip-${mcver}.jar" +echo " $(bashcolor 1 32)Success$(bashcolorend) - Saved launcher jar to /akarin-${mcver}-launcher.jar"