From 9e17d9e5bc00e2e7495ad292848043d281ff46f0 Mon Sep 17 00:00:00 2001 From: Manuel Quarneti Date: Fri, 30 Aug 2019 19:50:22 +0200 Subject: [PATCH 1/3] Refractoring --- server/_install.sh | 34 +++++++++++++++++++++------------- server/_install_mods.sh | 2 +- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/server/_install.sh b/server/_install.sh index 9c58d9a..bf0a84f 100755 --- a/server/_install.sh +++ b/server/_install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash INSTALLER_VERSION="0.5.0.33" MC_VERSION="1.14.4" @@ -21,18 +21,26 @@ else echo "fabric-server-launch.jar and server.jar found" fi -echo "#!/bin/sh" > start.sh -echo "java -Xms2499M -Xmx2500M -jar fabric-server-launch.jar" nogui >> start.sh -echo 'read -n1 -r -p "Press any key to continue..."' >> start.sh - -echo "#!/bin/sh" > start_autorestart.sh -echo "while true" >> start_autorestart.sh -echo "do" >> start_autorestart.sh -echo "java -Xms2499M -Xmx2500M -jar fabric-server-launch.jar" nogui >> start_autorestart.sh -echo 'echo "Crashed? Restarting in 10 seconds..."' >> start_autorestart.sh -echo "sleep 10" >> start_autorestart.sh -echo "done" >> start_autorestart.sh -echo 'read -n1 -r -p "Press any key to continue..."' >> start_autorestart.sh +cat > start.sh < start_autorestart.sh < eula.txt diff --git a/server/_install_mods.sh b/server/_install_mods.sh index 6155799..412a0d4 100755 --- a/server/_install_mods.sh +++ b/server/_install_mods.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash cd "$(dirname "$0")" || exit mkdir -p mods || exit cd mods || exit From 10ba54bb1c4346bd15345ad157d2fa2c4a5d2bc0 Mon Sep 17 00:00:00 2001 From: Manuel Quarneti Date: Sat, 31 Aug 2019 18:53:53 +0200 Subject: [PATCH 2/3] Revert change (#!/usr/bin/env bash) --- server/_install.sh | 6 +++--- server/_install_mods.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/_install.sh b/server/_install.sh index bf0a84f..3191c60 100755 --- a/server/_install.sh +++ b/server/_install.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash INSTALLER_VERSION="0.5.0.33" MC_VERSION="1.14.4" @@ -22,7 +22,7 @@ else fi cat > start.sh < start_autorestart.sh < Date: Sun, 1 Sep 2019 12:25:08 +0200 Subject: [PATCH 3/3] Changed shells --- server/_install.sh | 6 +++--- server/_install_mods.sh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/_install.sh b/server/_install.sh index 3191c60..babb41f 100755 --- a/server/_install.sh +++ b/server/_install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash INSTALLER_VERSION="0.5.0.33" MC_VERSION="1.14.4" @@ -22,7 +22,7 @@ else fi cat > start.sh < start_autorestart.sh <