From a93cbb1e986c59ffd888f072490db0afe4119093 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 13 Jan 2021 10:11:04 +1100
Subject: [PATCH] BUILDTOOLS-561: Improve support for paths with special
 characters

---
 applyPatches.sh   | 2 +-
 rebuildPatches.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applyPatches.sh b/applyPatches.sh
index 548fc6eb..a26ea35e 100755
--- a/applyPatches.sh
+++ b/applyPatches.sh
@@ -24,7 +24,7 @@ applyPatch() {
 
     echo "  Applying patches to $target..."
     git am --abort >/dev/null 2>&1
-    git am --3way "$basedir/${what}-Patches/"*.patch
+    git am --3way "../${what}-Patches/"*.patch
     if [ "$?" != "0" ]; then
         echo "  Something did not apply cleanly to $target."
         echo "  Please review above details and finish the apply then"
diff --git a/rebuildPatches.sh b/rebuildPatches.sh
index ddb0fffd..744aa6ec 100755
--- a/rebuildPatches.sh
+++ b/rebuildPatches.sh
@@ -29,16 +29,16 @@ savePatches() {
     target=$2
     branch=$3
     cd "$basedir/$target"
-    git format-patch --no-stat -N -o "$basedir/${what}-Patches/" $branch
+    git format-patch --no-stat -N -o "../${what}-Patches/" $branch
     cd "$basedir"
-    git add -A "$basedir/${what}-Patches"
+    git add -A "${what}-Patches"
     if [ "$clean" != "clean" ]; then
-        cleanupPatches "$basedir/${what}-Patches"
+        cleanupPatches "${what}-Patches"
     fi
     echo "  Patches saved for $what to $what-Patches/"
 }
 if [ "$clean" == "clean" ]; then
-	rm -rf *-Patches
+    rm -rf *-Patches
 fi
 savePatches Bukkit Spigot-API origin/spigot
 savePatches CraftBukkit Spigot-Server origin/patched