diff --git a/applyPatches.sh b/applyPatches.sh index 8ef677fbd..4308d9f8d 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 f34a1d8ec..d56ed82c2 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 c472ae680..6d71e6004 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