coll1234567 / CraftBukkit / 689f429c508

Commits

Vincent authored and md_5 committed 689f429c508 19 Feb 2020

#634: Cross platform patch scripts

Removes the need for installing gnu sed on Mac

Modified

-1
+#!/bin/bash
-2
-3
+if [ -z "$1" ]
-4
+then
-5
+    echo "Please run this script again with the clean decompile sources as an argument. In most cases this will be ../work/decompile-XXXX"
-6
+    exit
-7
+fi
-8
-+
+# https://stackoverflow.com/a/38595160
-+
+# https://stackoverflow.com/a/800644
-+
+if sed --version >/dev/null 2>&1; then
-+
+  strip_cr() {
-+
+    sed -i -- "s/\r//" "$@"
-+
+  }
-+
+else
-+
+  strip_cr () {
-+
+    sed -i "" "s/$(printf '\r')//" "$@"
-+
+  }
-+
+fi
-+
-21
+nms=$1/net/minecraft/server
-22
+cb=src/main/java/net/minecraft/server
-23
+#clean up and rebuild
-24
+rm -rf $cb
-25
+mkdir -p $cb
-26
+for file in $(/bin/ls nms-patches)
-27
+do
-28
+    patchFile="nms-patches/$file"
-29
+    file="$(echo $file | cut -d. -f1).java"
-30
-31
+    echo "Patching $file < $patchFile"
--
+    sed -i 's/\r//' "$nms/$file" > /dev/null
-+
+    strip_cr "$nms/$file" > /dev/null
-33
-34
+    cp "$nms/$file" "$cb/$file"
-35
+    patch -d src/main/java/ "net/minecraft/server/$file" < "$patchFile"
-36
+done