mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Batch files now work in directories with spaces in it

Browse source 
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
This commit is contained in:
mrkirby153 2013-11-05 16:26:20 -08:00 committed by md_5
parent cdbe22b7c7
commit 5b808a6d45
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applyPatches.sh
View file

@ -6,10 +6,10 @@ echo "Rebuilding Forked projects.... "
function applyPatch { function applyPatch {
what=$1 what=$1
target=$2 target=$2
cd $basedir/$what cd "$basedir/$what"
git branch -f upstream >/dev/null git branch -f upstream >/dev/null
cd $basedir cd "$basedir"
if [ ! -d "$basedir/$target" ]; then if [ ! -d "$basedir/$target" ]; then
git clone $1 $target -b upstream git clone $1 $target -b upstream
fi fi
@ -22,7 +22,7 @@ function applyPatch {
git reset --hard upstream/upstream git reset --hard upstream/upstream
echo " Applying patches to $target..." echo " Applying patches to $target..."
git am --abort git am --abort
git am --3way $basedir/${what}-Patches/*.patch git am --3way "$basedir/${what}-Patches/"*.patch
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo " Something did not apply cleanly to $target." echo " Something did not apply cleanly to $target."
echo " Please review above details and finish the apply then" echo " Please review above details and finish the apply then"

12
rebuildPatches.sh
View file

@ -3,7 +3,7 @@
basedir=`pwd` basedir=`pwd`
echo "Rebuilding patch files from current fork state..." echo "Rebuilding patch files from current fork state..."
function cleanupPatches { function cleanupPatches {
cd $1 cd "$1"
for patch in *.patch; do for patch in *.patch; do
gitver=$(tail -n 2 $patch | grep -ve "^$" | tail -n 1) 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)") 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 { function savePatches {
what=$1 what=$1
target=$2 target=$2
cd $basedir/$target/ cd "$basedir/$target"
git format-patch --no-stat -N -o $basedir/${what}-Patches/ upstream/upstream git format-patch --no-stat -N -o "$basedir/${what}-Patches/" upstream/upstream
cd $basedir cd "$basedir"
git add $basedir/${what}-Patches git add "$basedir/${what}-Patches"
cleanupPatches $basedir/${what}-Patches cleanupPatches "$basedir/${what}-Patches"
echo " Patches saved for $what to $what-Patches/" echo " Patches saved for $what to $what-Patches/"
} }

2
upstreamMerge.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
basedir=`pwd` basedir=`pwd`
function update { function update {
cd $basedir/$1 cd "$basedir/$1"
git fetch && git reset --hard origin/master git fetch && git reset --hard origin/master
cd ../ cd ../
git add $1 git add $1