summaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorMariell Hoversholm <[email protected]>2021-03-16 16:50:45 +0100
committerMariell Hoversholm <[email protected]>2021-03-18 18:03:22 +0100
commitf6d820f077cb565d0a5e891eaf3e586d53f1204a (patch)
tree5d111678250aa7a27a809a53635e015f21690652 /scripts
parent0f78e95250b1123760c24473329e248ba817827d (diff)
downloadPaper-f6d820f077cb565d0a5e891eaf3e586d53f1204a.tar.gz
Paper-f6d820f077cb565d0a5e891eaf3e586d53f1204a.zip
It compiles
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/importmcdev.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index 597f797c1f..fb795a84b2 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -62,7 +62,7 @@ function importLibrary {
files=$(cat "$basedir/Spigot-Server-Patches/"* | grep "+++ b/src/main/java/net/minecraft/" | sort | uniq | sed 's/\+\+\+ b\/src\/main\/java\/net\/minecraft\///g')
-nonnms=$(grep -R "new file mode" -B 1 "$basedir/Spigot-Server-Patches/" | grep -v "new file mode" | grep -oE "net\/minecraft\/**\/.*.java" | grep -oE "[A-Za-z]+?.java$" --color=none | sed 's/.java//g')
+nonnms=$(grep -R "new file mode" -B 1 "$basedir/Spigot-Server-Patches/" | grep -v "new file mode" | grep -oE "net\/minecraft\/**\/.*.java" | sed -E 's/.*\/net\/minecraft\/(.*)/\1/g')
function containsElement {
local e
for e in "${@:2}"; do
@@ -78,12 +78,16 @@ for f in $files; do
f="$(echo "$f" | sed 's/.java//g')"
if [ ! -f "$decompiledir/$nms/$f.java" ]; then
echo "$(color 1 31) ERROR!!! Missing NMS$(color 1 34) $f $(colorend)";
+ error=true
else
import $f
fi
fi
fi
done
+if [ -n "$error" ]; then
+ exit 1
+fi
########################################################
########################################################