Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 02:08:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup codebase

Browse Source
This commit is contained in:
William Blake Galbreath
2020-10-04 15:40:39 -05:00
parent 81ca45c1e3
commit 70e2ec08ea
6 changed files with 2 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/apply.sh
View File

@@ -62,8 +62,8 @@ function applyPatch {
git reset --hard upstream/upstream
echo " Applying patches to $target..."
git am --abort >/dev/null 2>&1
git am --3way --ignore-whitespace "$basedir/patches/$patch_folder/"*.patch
if [ "$?" != "0" ]; then
if ! git am --3way --ignore-whitespace "$basedir/patches/$patch_folder/"*.patch
then
echo " Something did not apply cleanly to $target."
echo " Please review above details and finish the apply then"
echo " save the changes with rebuildPatches.sh"