Rebuild patches after we continue from a paper edit.

paper

@@ -49,29 +49,37 @@ case "$1" in
         cd "$basedir"
     ;;
     "e" | "edit")
-        if [[ "$2" = "server" ]] ; then
+        case "$2" in
-            cd "$basedir/Paper-Server"
+            "server")
-            export LAST_EDIT=$(pwd)
+                cd "$basedir/Paper-Server"
+                export LAST_EDIT=$(pwd)
 
-            paperstash
+                paperstash
-            git rebase -i upstream/upstream
+                git rebase -i upstream/upstream
-            paperunstash
+                paperunstash
-        elif [[ "$2" = "api" ]] ; then
+            ;;
-            cd "$basedir/Paper-API"
+            "api")
-            export LAST_EDIT=$(pwd)
+                cd "$basedir/Paper-API"
+                export LAST_EDIT=$(pwd)
 
-            paperstash
+                paperstash
-            git rebase -i upstream/upstream
+                git rebase -i upstream/upstream
-            paperunstash
+                paperunstash
-        elif [[ "$2" = "continue" ]] ; then
+            ;;
-            cd "$LAST_EDIT"
+            "continue")
-            git add .
+                cd "$LAST_EDIT"
-            git rebase --continue
+                git add .
-            unset LAST_EDIT
+                git rebase --continue
-            scripts/rebuildPatches.sh "$basedir"
+                unset LAST_EDIT
-        else
+                (
-            echo "You must edit either the api or server."
+                    cd "$basedir"
-        fi
+                    scripts/rebuildPatches.sh "$basedir"
+                )
+            ;;
+            *)
+                echo "You must edit either the api or server."
+            ;;
+        esac
     ;;
     "setup")
         if [[ -f ~/.bashrc ]] ; then

scripts/applyPatches.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PS1="$"
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"
 echo "Rebuilding Forked projects.... "
 

scripts/build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-basedir="$1"
+basedir=$(realpath "$1")
 
 (git submodule update --init && ./scripts/remap.sh "$basedir" && ./scripts/decompile.sh "$basedir" && ./scripts/init.sh "$basedir" && ./scripts/applyPatches.sh "$basedir") || (
 	echo "Failed to build Paper"

scripts/decompile.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PS1="$"
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"
 minecraftversion=$(cat "$workdir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)
 decompiledir="$workdir/$minecraftversion"

scripts/importmcdev.sh

@@ -3,7 +3,7 @@
 nms="net/minecraft/server"
 export MODLOG=""
 PS1="$"
-basedir="$1"
+basedir=$(realpath "$1")
 
 workdir="$basedir/work"
 minecraftversion=$(cat "$workdir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)

scripts/init.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PS1="$"
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"
 minecraftversion=$(cat "$workdir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)
 decompiledir="$workdir/$minecraftversion"

scripts/makemcdevsrc.sh

@@ -2,7 +2,7 @@
 
 PS1="$"
 
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"
 minecraftversion=$(cat "$basedir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)
 decompiledir="$workdir/$minecraftversion"

scripts/paperclip.sh

@@ -1,17 +1,18 @@
 #!/usr/bin/env bash
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"
 mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
 paperjar="../../Paper-Server/target/paper-$mcver.jar"
 vanillajar="../$mcver/$mcver.jar"
 
-cd "$workdir/Paperclip"
+(
-mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar" || exit 1
+    cd "$workdir/Paperclip"
-cd ..
+    mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar" || exit 1
+)
 cp "$workdir/Paperclip/target/paperclip-${mcver}.jar" "$basedir/paperclip.jar"
 
 echo ""
 echo ""
 echo ""
 echo "Build success!"
-echo "Copied final jar to $basedir/paperclip.jar"
+echo "Copied final jar to "$(realpath "$basedir/paperclip.jar")

scripts/rebuildPatches.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PS1="$"
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"
 echo "Rebuilding patch files from current fork state..."
 git config core.safecrlf false

scripts/remap.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PS1="$"
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"
 minecraftversion=$(cat ${workdir}/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
 minecrafthash=$(cat ${workdir}/BuildData/info.json | grep minecraftHash | cut -d '"' -f 4)

scripts/upstreamMerge.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PS1="$"
-basedir="$1"
+basedir=$(realpath "$1")
 workdir="$basedir/work"
 
 function update {