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
This commit is contained in:
parent
cdbe22b7c7
commit
5b808a6d45
@ -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"
|
||||
|
@ -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/"
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user