From 704348fb3ff5868bb50359bd2585c359c35fe824 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Fri, 28 Nov 2014 17:06:11 -0600 Subject: [PATCH] Don't commit unchanged patches By: GunfighterJ --- paper-server/makePatches.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/paper-server/makePatches.sh b/paper-server/makePatches.sh index 8dd725d630..5c0f74f406 100755 --- a/paper-server/makePatches.sh +++ b/paper-server/makePatches.sh @@ -2,20 +2,26 @@ if [ -z "$1" ] then - echo "Please run this script again with the clean decompile sources as an argument. In most cases this will be ../work/decompile-XXXX" - exit + echo "Please run this script again with the clean decompile sources as an argument. In most cases this will be ../work/decompile-XXXX" + exit fi for file in $(ls src/main/java/net/minecraft/server) do - echo "Diffing $file" - dos2unix -q $1/net/minecraft/server/$file $1/net/minecraft/server/$file - outName=$(echo nms-patches/"$(echo $file | cut -d. -f1)".patch) - patchNew=$(diff -u $1/net/minecraft/server/$file src/main/java/net/minecraft/server/$file) + echo "Diffing $file" + dos2unix -q $1/net/minecraft/server/$file $1/net/minecraft/server/$file + outName=$(echo nms-patches/"$(echo $file | cut -d. -f1)".patch) + patchNew=$(diff -u $1/net/minecraft/server/$file src/main/java/net/minecraft/server/$file) + if [ -f "$outName" ] + then patchCut=$(echo "$patchNew" | tail -n +3) patchOld=$(cat "$outName" | tail -n +3) if [ "$patchCut" != "$patchOld" ] ; then echo "$outName changed" echo "$patchNew" > "$outName" fi -done + else + echo "New patch $outName" + echo "$patchNew" > "$outName" + fi +done \ No newline at end of file