From 2e01d5ac179fd80fd3a2ff7664e0a98e521b81b2 Mon Sep 17 00:00:00 2001
From: Spigot <noreply+git-spigot@papermc.io>
Date: Tue, 5 Nov 2013 16:26:20 -0800
Subject: [PATCH] Batch files now work in directories with spaces in it

Before the batch files could not run if the path to the directory had one
or more spaces in it. EG: "C:/Desktop/Spigot Repo". Now works with the
patch

By: mrkirby153 <mr.austinwhyte@gmail.com>
---
 applyPatches.sh   |  6 +++---
 rebuildPatches.sh | 12 ++++++------
 upstreamMerge.sh  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/applyPatches.sh b/applyPatches.sh
index 8ef677fbd2..4308d9f8d4 100755
--- a/applyPatches.sh
+++ b/applyPatches.sh
@@ -6,10 +6,10 @@ echo "Rebuilding Forked projects.... "
 function applyPatch {
     what=$1
     target=$2
-    cd $basedir/$what
+    cd "$basedir/$what"
     git branch -f upstream >/dev/null
 
-    cd $basedir
+    cd "$basedir"
     if [ ! -d  "$basedir/$target" ]; then
         git clone $1 $target -b upstream
     fi
@@ -22,7 +22,7 @@ function applyPatch {
     git reset --hard upstream/upstream
     echo "  Applying patches to $target..."
     git am --abort
-    git am --3way $basedir/${what}-Patches/*.patch
+    git am --3way "$basedir/${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 f34a1d8ece..d56ed82c23 100755
--- a/rebuildPatches.sh
+++ b/rebuildPatches.sh
@@ -3,7 +3,7 @@
 basedir=`pwd`
 echo "Rebuilding patch files from current fork state..."
 function cleanupPatches {
-    cd $1
+    cd "$1"
     for patch in *.patch; do
         gitver=$(tail -n 2 $patch | grep -ve "^$" | tail -n 1)
         diffs=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)")
@@ -23,11 +23,11 @@ function cleanupPatches {
 function savePatches {
     what=$1
     target=$2
-    cd $basedir/$target/
-    git format-patch --no-stat -N -o $basedir/${what}-Patches/ upstream/upstream
-    cd $basedir
-    git add $basedir/${what}-Patches
-    cleanupPatches $basedir/${what}-Patches
+    cd "$basedir/$target"
+    git format-patch --no-stat -N -o "$basedir/${what}-Patches/" upstream/upstream
+    cd "$basedir"
+    git add "$basedir/${what}-Patches"
+    cleanupPatches "$basedir/${what}-Patches"
     echo "  Patches saved for $what to $what-Patches/"
 }
 
diff --git a/upstreamMerge.sh b/upstreamMerge.sh
index c472ae6805..6d71e60045 100755
--- a/upstreamMerge.sh
+++ b/upstreamMerge.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 basedir=`pwd`
 function update {
-    cd $basedir/$1
+    cd "$basedir/$1"
     git fetch && git reset --hard origin/master
     cd ../
     git add $1