Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-28 03:27:37 +01:00
Code Issues Projects Releases Wiki Activity

Ensure that we checkout the submodules before patching(Fixes #262)

Browse Source
This commit is contained in:
Shane Freeder 2018-07-24 16:57:08 +01:00
parent ed37fdbc41
commit cc4457473d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build.sh
View File

@ -1,3 +1,7 @@
#!/usr/bin/env bash
git submodule update --init && ./scripts/applyPatches.sh && pushd Waterfall-Proxy && mvn clean package && popd
git submodule update --init && ./scripts/applyPatches.sh
if [ "$1" == "--jar" ]; then
mvn clean package
fi

4
waterfall
View File

@ -5,13 +5,13 @@ case "$1" in
scripts/rebuildPatches.sh
;;
"p" | "patch")
scripts/applyPatches.sh
scripts/build.sh
;;
"m" | "up" | "merge")
scripts/mergeUpstream.sh
;;
"b" | "build")
scripts/build.sh
scripts/build.sh --jar
;;
"e" | "edit")
scripts/edit.sh