From 382b82b320d429062b4bc860c81644d9db4c90c8 Mon Sep 17 00:00:00 2001 From: mathias Date: Wed, 11 Jul 2018 17:23:47 +0300 Subject: [PATCH] Ship tmux in base files --- bin/compile | 5 ----- bin/start | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/compile b/bin/compile index 124c84a..28ced63 100755 --- a/bin/compile +++ b/bin/compile @@ -6,11 +6,6 @@ mkdir -p $BUILD_DIR/bin/ mv $BIN_DIR/start $BUILD_DIR/bin/ mv $BIN_DIR/excludes $BUILD_DIR/bin/ -curl -o tmux.deb -s -L "http://mirrors.kernel.org/ubuntu/pool/main/t/tmux/tmux_1.8-5_amd64.deb" -dpkg -x *.deb . -mv usr/bin/tmux $BUILD_DIR/bin/ -chmod +x $BUILD_DIR/bin/tmux - curl -o $BUILD_DIR/minecraft-server.jar -s -L "https://yivesmirror.com/files/paperspigot/PaperSpigot-latest.jar" curl -o $BUILD_DIR/plugins/DoBlockImage.jar -s -L "https://api.spiget.org/v2/resources/5454/download" curl -o Essentials.zip -s -L "https://ci.ender.zone/job/EssentialsX/lastSuccessfulBuild/artifact/Essentials/target/*zip*/target.zip" diff --git a/bin/start b/bin/start index b15258d..16b8b27 100755 --- a/bin/start +++ b/bin/start @@ -4,6 +4,7 @@ touch banned-ips.json banned-players.json ops.json usercache.json whitelist.json echo "$PRIVATE_KEY" > .ssh/id_rsa chmod 400 $(find . ! -path "*/.*" -type f) chmod -R 500 crash-reports/ dumps/ plugins/bStats/ plugins/PluginMetrics/ plugins/ProtocolLib/ plugins/Updater/ +chmod +x bin/tmux if [ "$(ssh -o StrictHostKeyChecking=no -T -c aes256-ctr -o Compression=no -x serv@kaboom.pw 'du -s sync/worlds/' | awk '{print $1}')" -gt "500000" ]; then ssh -o StrictHostKeyChecking=no serv@kaboom.pw 'cd sync/ && find . ! -path './plugins/WorldEdit/schematics' -type d -exec rm -rf {} +' @@ -21,7 +22,7 @@ while true; do done & bin/tmux new -d -s server 'while true; do - .java/bin/java -Xms0m -Xmx300m -Xss512k -XX:MinHeapFreeRatio=1 -XX:MaxHeapFreeRatio=10 -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:MaxGCPauseMillis=100 -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:InitiatingHeapOccupancyPercent=10 -XX:TargetSurvivorRatio=90 -XX:-UseBiasedLocking -XX:+UseLargePagesInMetaspace -XX:+UseNUMA -XX:+UseTransparentHugePages -Dcom.mojang.eula.agree=true -Dlog4j.configurationFile=log4j2.xml -jar minecraft-server.jar --world-dir=worlds > /dev/null 2>&1 + bin/java/bin/java -Xms0m -Xmx300m -Xss512k -XX:MinHeapFreeRatio=1 -XX:MaxHeapFreeRatio=10 -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:MaxGCPauseMillis=100 -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:InitiatingHeapOccupancyPercent=10 -XX:TargetSurvivorRatio=90 -XX:-UseBiasedLocking -XX:+UseLargePagesInMetaspace -XX:+UseNUMA -XX:+UseTransparentHugePages -Dcom.mojang.eula.agree=true -Dlog4j.configurationFile=log4j2.xml -jar minecraft-server.jar --world-dir=worlds > /dev/null 2>&1 sleep 1 done' &