Claenup stuff, add metrics, and rename references from Waterfall to Travertine
This commit is contained in:
parent
45fce075ad
commit
9fdca54f66
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
|||||||
[submodule "Waterfall"]
|
|
||||||
path = Waterfall
|
|
||||||
url = https://github.com/WaterfallMC/Waterfall.git
|
|
@ -60,8 +60,14 @@ if [[ "$gpgsign" == "true" ]]; then
|
|||||||
git config --global commit.gpgsign false
|
git config --global commit.gpgsign false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Apply waterfall patches
|
||||||
|
basedir=$basedir/Waterfall
|
||||||
|
pushd Waterfall
|
||||||
|
applyPatch BungeeCord Waterfall-Proxy HEAD
|
||||||
|
popd
|
||||||
|
basedir=$(dirname $basedir)
|
||||||
|
|
||||||
# Apply patches
|
# Apply travertine patches
|
||||||
applyPatch Waterfall/Waterfall-Proxy Travertine-Proxy HEAD
|
applyPatch Waterfall/Waterfall-Proxy Travertine-Proxy HEAD
|
||||||
|
|
||||||
enableCommitSigningIfNeeded
|
enableCommitSigningIfNeeded
|
||||||
|
2
build.sh
2
build.sh
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
./prepareBuild.sh && pushd Travertine-Proxy && mvn clean package && popd
|
./applyPatches.sh && pushd Travertine-Proxy && mvn clean package && popd
|
||||||
|
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
git submodule update --recursive --init
|
|
||||||
|
|
||||||
pushd Waterfall
|
|
||||||
|
|
||||||
./applyPatches.sh
|
|
||||||
|
|
||||||
popd
|
|
||||||
|
|
||||||
./applyPatches.sh
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user