summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <me@md-5.net>2014-12-13 23:44:36 +0100
committermd_5 <me@md-5.net>2014-12-13 23:44:36 +0100
commitb36f4d56ee7ed8656b2f785b3500ffd2a7dde1d3 (patch)
treeb37b6622bf919d6d4315fbf8548539cd5701c8f9
parent9f422c3424f22f963662c18d3ef8d237d0f2e32d (diff)
parent3d1cdfa2b1d023934a9950e604e20e1140c11fce (diff)
downloadcraftbukkit-b36f4d56ee7ed8656b2f785b3500ffd2a7dde1d3.tar
craftbukkit-b36f4d56ee7ed8656b2f785b3500ffd2a7dde1d3.tar.gz
craftbukkit-b36f4d56ee7ed8656b2f785b3500ffd2a7dde1d3.tar.lz
craftbukkit-b36f4d56ee7ed8656b2f785b3500ffd2a7dde1d3.tar.xz
craftbukkit-b36f4d56ee7ed8656b2f785b3500ffd2a7dde1d3.zip
Merge pull request #47 in SPIGOT/craftbukkit from ~BAMMERBOM/craftbukkit:master to master
* commit '3d1cdfa2b1d023934a9950e604e20e1140c11fce': Fix making craftbukkit patches.
-rwxr-xr-xmakePatches.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/makePatches.sh b/makePatches.sh
index 0ebca409..a62f3641 100755
--- a/makePatches.sh
+++ b/makePatches.sh
@@ -12,6 +12,7 @@ for file in $(/bin/ls $cb)
do
echo "Diffing $file"
sed -i 's/\r//' "$nms/$file"
+ sed -i 's/\r//' "$cb/$file"
outName=$(echo nms-patches/"$(echo $file | cut -d. -f1)".patch)
patchNew=$(diff -u "$nms/$file" "$cb/$file")
if [ -f "$outName" ]