Skip to content

Commit 945c503

Browse files
authored
Replaced commands not supported by default on Windows in build scripts (#25)
1 parent 72676f9 commit 945c503

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

init.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ mkdir -p $cb
2121
for file in nms-patches/* "$basedir"/nms-patches/*
2222
do
2323
patchFile="$file"
24-
file="$(echo "$file" | rev | cut -d/ -f1 | rev | cut -d. -f1).java"
24+
filename="${file##*/}"
25+
filename="${filename%.*}"
26+
file="$filename.java"
2527

2628
echo "Patching $file < $patchFile"
2729
sed -i 's/\r//' "$nms/$file" > /dev/null

remap.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@ fi
3737
# KigPaper start - Remove log4j & other deps from vanilla jar
3838
echo "KIG: Removing dependencies..."
3939
if [ ! -f "$jarpath-kig-nodeps.jar" ]; then
40-
cp "$jarpath.jar" "$jarpath-kig-nodeps.jar" 1>/dev/null
41-
zip -d "$jarpath-kig-nodeps.jar" org/apache/logging/log4j/* io/netty/* META-INF/io.netty.*
40+
mkdir -p "$workdir/tmp_kig"
41+
(
42+
cd "$workdir/tmp_kig"
43+
jar xf "$jarpath.jar"
44+
rm -r org/apache/logging/log4j io/netty META-INF/io.netty.*
45+
jar cf "$jarpath-kig-nodeps.jar" .
46+
)
47+
rm -r "$workdir/tmp_kig"
4248
echo "KIG: Removed dependencies from vanilla jar. Make sure to have them in pom.xml!"
4349
fi
4450
# KigPaper end

0 commit comments

Comments
 (0)