Misc script fixes

Also, grab upstreamCommit
This commit is contained in:
Shane Freeder 2019-02-20 19:31:30 +00:00 committed by Marc Baloup
parent 2ffb99b297
commit b7991a0eaa
7 changed files with 33 additions and 1 deletions

0
scripts/applyPatches.sh Normal file → Executable file
View File

6
scripts/build.sh Normal file → Executable file
View File

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

0
scripts/edit.sh Normal file → Executable file
View File

0
scripts/mergeUpstream.sh Normal file → Executable file
View File

0
scripts/rebuildPatches.sh Normal file → Executable file
View File

28
scripts/upstreamCommit.sh Executable file
View File

@ -0,0 +1,28 @@
#!/usr/bin/env bash
(
set -e
PS1="$"
function changelog() {
base=$(git ls-tree HEAD $1 | cut -d' ' -f3 | cut -f1)
cd $1 && git log --oneline ${base}...HEAD
}
waterfall=$(changelog Waterfall)
updated=""
logsuffix=""
if [ ! -z "$waterfall" ]; then
logsuffix="$logsuffix\n\nWaterfall Changes:\n$waterfall"
if [ -z "$updated" ]; then updated="Waterfall"; else updated="$updated/Waterfall"; fi
fi
disclaimer="Upstream has released updates that appears to apply and compile correctly.\nThis update has not been tested by PaperMC and as with ANY update, please do your own testing"
if [ ! -z "$1" ]; then
disclaimer="$@"
fi
log="${UP_LOG_PREFIX}Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
echo -e "$log" | git commit -F -
) || exit 1

0
travertine Normal file → Executable file
View File