diff options
| author | Aikar <[email protected]> | 2018-09-03 14:57:29 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2018-09-03 14:59:29 -0400 |
| commit | 7cdfd6e538826a5c78b354ab57d98a5daeb1e37f (patch) | |
| tree | 682ff95fb5e58c521684f2b7c1d484d11d3c7753 /scripts | |
| parent | ab56ada4d2ad13aceb5aa1016a64c7c667cdc421 (diff) | |
| download | Paper-7cdfd6e538826a5c78b354ab57d98a5daeb1e37f.tar.gz Paper-7cdfd6e538826a5c78b354ab57d98a5daeb1e37f.zip | |
[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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/importmcdev.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index 2424410639..d7c95d0ed4 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 |