core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CI-SKIP] fixed sed -i for bsd sed (#4782)

This commit is contained in:
Jake Potrebic 2020-11-19 07:47:22 -08:00 committed by GitHub
parent 7ae47d4eb3
commit e6d7bdca1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/init.sh
View File

@ -11,6 +11,18 @@ nms="$spigotdecompiledir/net/minecraft/server"
cb="src/main/java/net/minecraft/server" cb="src/main/java/net/minecraft/server"
gitcmd="git -c commit.gpgsign=false" gitcmd="git -c commit.gpgsign=false"
# 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
patch=$(which patch 2>/dev/null) patch=$(which patch 2>/dev/null)
if [ "x$patch" == "x" ]; then if [ "x$patch" == "x" ]; then
patch="$basedir/hctap.exe" patch="$basedir/hctap.exe"
@ -53,7 +65,7 @@ do
echo "Patching $file < $patchFile" echo "Patching $file < $patchFile"
set +e set +e
sed -i 's/\r//' "$nms/$file" > /dev/null strip_cr "$nms/$file" > /dev/null
set -e set -e
"$patch" -s -d src/main/java/ "net/minecraft/server/$file" < "$patchFile" "$patch" -s -d src/main/java/ "net/minecraft/server/$file" < "$patchFile"