Add testserver command - quickly start a test server

This will help encourage testing with some widely used plugins
to help identify issues caused by changes before they are pushed.
Dieser Commit ist enthalten in:
Aikar 2016-04-09 21:33:32 -04:00
Ursprung e50e705520
Commit 7079bd6244
4 geänderte Dateien mit 145 neuen und 9 gelöschten Zeilen

1
.gitignore vendored
Datei anzeigen

@ -32,6 +32,7 @@ work/Spigot
work/Spigot-Server
work/Spigot-API
work/*.jar
work/test-server
# Mac filesystem dust
.DS_Store/

22
paper
Datei anzeigen

@ -24,15 +24,7 @@ done
SOURCE=$([[ "$SOURCE" = /* ]] && echo "$SOURCE" || echo "$PWD/${SOURCE#./}")
basedir=$(dirname "$SOURCE")
paperstash() {
STASHED=$(git stash)
}
paperunstash() {
if [[ "$STASHED" != "No local changes to save" ]] ; then
git stash pop
fi
}
. $basedir/scripts/functions.sh
case "$1" in
"rb" | "rbp" | "rebuild")
@ -72,6 +64,16 @@ case "$1" in
scripts/makemcdevsrc.sh "$basedir"
)
;;
"t" | "test" | "testserver")
(
cd "$basedir"
shift
scripts/testServer.sh "$basedir" "$@"
)
;;
"td" | "testdir")
cd "${PAPER_TEST_DIR:-$basedir/work/test-server}"
;;
"r" | "root")
cd "$basedir"
;;
@ -169,5 +171,7 @@ esac
unset RCPATH
unset SOURCE
unset basedir
unset -f color
unset -f colorend
unset -f paperstash
unset -f paperunstash

22
scripts/functions.sh Ausführbare Datei
Datei anzeigen

@ -0,0 +1,22 @@
#!/usr/bin/env bash
color() {
if [ $2 ]; then
echo -e "\e[$1;$2m"
else
echo -e "\e[$1m"
fi
}
colorend() {
echo -e "\e[m"
}
paperstash() {
STASHED=$(git stash 2>/dev/null|| return 0) # errors are ok
}
paperunstash() {
if [[ "$STASHED" != "No local changes to save" ]] ; then
git stash pop 2>/dev/null|| return 0 # errors are ok
fi
}

109
scripts/testServer.sh Ausführbare Datei
Datei anzeigen

@ -0,0 +1,109 @@
#!/bin/bash
set -e
PS1="$"
basedir="$(cd "$1" && pwd -P)"
workdir="$basedir/work"
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
decompiledir="$workdir/$minecraftversion"
#
# FUNCTIONS
#
. $basedir/scripts/functions.sh
updateTest() {
paperstash
git reset --hard origin/master
paperunstash
}
papertestdir="${PAPER_TEST_DIR:-$workdir/test-server}"
mkdir -p "$papertestdir"
cd "$papertestdir"
#
# SKELETON CHECK
#
if [ ! -d .git ]; then
git init
git remote add origin ${PAPER_TEST_SKELETON:-https://github.com/PaperMC/PaperTestServer}
git fetch origin
updateTest
elif [ "$2" == "update" ] || [ "$3" == "update" ]; then
updateTest
fi
if [ ! -f server.properties ] || [ ! -d plugins ]; then
echo " "
echo " Checking out Test Server Skeleton"
updateTest
fi
#
# EULA CHECK
#
if [ -z "$(grep true eula.txt 2>/dev/null)" ]; then
echo
echo "$(color 32) It appears you have not agreed to Mojangs EULA yet! Press $(color 1 33)y$(colorend) $(color 32)to confirm agreement to"
read -p " Mojangs EULA found at:$(color 1 32) https://account.mojang.com/documents/minecraft_eula $(colorend) " -n 1 -r
echo ""
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
echo "$(color 1 31)Aborted$(colorend)"
exit;
fi
echo "eula=true" > eula.txt
fi
#
# JAR CHECK
#
jar="$basedir/Paper-Server/target/paper-${minecraftversion}.jar"
if [ ! -f "$jar" ] || [ "$2" == "build" ] || [ "$3" == "build" ]; then
(
echo "Building Paper"
cd "$basedir"
./paper patch
mvn clean install
)
fi
#
# JVM FLAGS
#
baseargs="-server -Xmx${PAPER_TEST_MEMORY:-2G} -Dfile.encoding=UTF-8 -XX:MaxGCPauseMillis=50 -XX:+UseG1GC"
baseargs="$baseargs -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=70 "
cmd="java ${PAPER_TEST_BASE_JVM_ARGS:-$baseargs} ${PAPER_TEST_EXTRA_JVM_ARGS} -jar $jar"
#
# MULTIPLEXER CHOICE
#
multiplex=${PAPER_TEST_MULTIPLEXER:-screen}
if [ "$multiplex" == "tmux" ]; then
echo "tmux is currently not supported. Please submit a PR to add tmux support if you need it.";
multiplex="screen"
fi
if [ "$multiplex" == "tmux" ] && [ ! -z "$(which tmux)" ]; then
echo "tmux not supported"
elif [ ! -z "$(which screen)" ]; then # default screen last as final fallback
cmd="screen -DURS papertest $cmd"
else
echo "Screen not found - It is strongly recommended to install screen"
sleep 3
fi
#
# START / LOG
#
$cmd 2>&1 | tee -a ${PAPER_TEST_OUTPUT_LOG:-logs/output.log}