Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-28 21:25:47 +01:00
Code Issues Projects Releases Wiki Activity

Improve applyPatches.sh

Browse Source 
Get rid of all that crazy parenthesis stuff
This commit is contained in:
Techcable 2016-05-31 17:01:10 -06:00
parent ca92e83419
commit 7d8e09b311
No known key found for this signature in database
GPG Key ID: 091A03B91D7FCE68
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
applyPatches.sh
View File

@ -1,12 +1,19 @@
#!/usr/bin/env bash #!/usr/bin/env bash
(
PS1="$" PS1="$"
basedir="$(cd "$1" && pwd -P)" basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work" workdir="$basedir/work"
gpgsign="$(git config commit.gpgsign || echo "false")" gpgsign="$(git config commit.gpgsign || echo "false")"
echo "Rebuilding Forked projects.... " echo "Rebuilding Forked projects.... "
function enableCommitSigningIfNeeded {
if [[ "$gpgsign" == "true" ]]; then
echo "Re-enabling GPG Signing"
# Yes, this has to be global
git config --global commit.gpgsign true
fi
}
function applyPatch { function applyPatch {
what=$1 what=$1
what_name=$(basename "$what") what_name=$(basename "$what")
@ -23,11 +30,6 @@ function applyPatch {
fi fi
cd "$basedir/$target" cd "$basedir/$target"
# Disable GPG signing before AM, slows things down and doesn't play nicely.
# There is also zero rational or logical reason to do so for these sub-repo AMs.
# Calm down kids, it's re-enabled (if needed) immediately after, pass or fail.
git config commit.gpgsign false
echo "Resetting $target to $what_name..." echo "Resetting $target to $what_name..."
git remote rm upstream > /dev/null 2>&1 git remote rm upstream > /dev/null 2>&1
git remote add upstream "$basedir/$what" >/dev/null 2>&1 git remote add upstream "$basedir/$what" >/dev/null 2>&1
@ -43,26 +45,23 @@ function applyPatch {
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"
echo " save the changes with rebuildPatches.sh" echo " save the changes with rebuildPatches.sh"
enableCommitSigningIfNeeded
exit 1 exit 1
else else
echo " Patches applied cleanly to $target" echo " Patches applied cleanly to $target"
fi fi
} }
function enableCommitSigningIfNeeded { # Disable GPG signing before AM, slows things down and doesn't play nicely.
# There is also zero rational or logical reason to do so for these sub-repo AMs.
# Calm down kids, it's re-enabled (if needed) immediately after, pass or fail.
if [[ "$gpgsign" == "true" ]]; then if [[ "$gpgsign" == "true" ]]; then
git config commit.gpgsign true echo "_Temporarily_ disabling GPG signing"
git config --global commit.gpgsign false
fi fi
}
# Apply paper
cd "$basedir" # Apply patches
( applyPatch BungeeCord Waterfall-Proxy HEAD
applyPatch "BungeeCord" Waterfall-Proxy HEAD
enableCommitSigningIfNeeded enableCommitSigningIfNeeded
) || (
echo "Failed to apply WaterfallPatches"
enableCommitSigningIfNeeded
exit 1
) || exit 1
)