From 7cdfd6e538826a5c78b354ab57d98a5daeb1e37f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Sep 2018 14:57:29 -0400 Subject: [PATCH] [CI-SKIP] Improve last patch to not use wildcard Since were having issues on windows for too many patch file names, figured better use -R instead. Also added $basedir back --- scripts/importmcdev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index 242441063..d7c95d0ed 100755 --- a/scripts/importmcdev.sh +++ b/scripts/importmcdev.sh @@ -41,7 +41,7 @@ function import { files=$(cat "$basedir/Spigot-Server-Patches/"* | grep "+++ b/src/main/java/net/minecraft/server/" | sort | uniq | sed 's/\+\+\+ b\/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g') -nonnms=$(grep "new file mode" -B 1 Spigot-Server-Patches/* | grep -v "new file mode" | grep -oE "net\/minecraft\/server\/.*.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\/server\/.*.java" | grep -oE "[A-Za-z]+?.java$" --color=none | sed 's/.java//g') function containsElement { local e for e in "${@:2}"; do