From 4f1d2a4391cd82f0beb4c9a28df3bd1401358ad3 Mon Sep 17 00:00:00 2001 From: Jim Ramsay Date: Sun, 27 Mar 2022 22:08:14 -0400 Subject: [PATCH] startserver.sh: Fixup inconsistent whitespace The script has an odd assortment of spaces and tabs which hamper readability in plain text editors. Signed-off-by: Jim Ramsay --- server_files/startserver.sh | 53 +++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/server_files/startserver.sh b/server_files/startserver.sh index 21cf2ff..f080950 100755 --- a/server_files/startserver.sh +++ b/server_files/startserver.sh @@ -6,32 +6,33 @@ if [[ $(cat server-setup-config.yaml | grep 'ramDisk:' | awk 'BEGIN {FS=":"}{pri sudo mount -t tmpfs -o size=2G tmpfs $SAVE_DIR DO_RAMDISK=1 fi - if [ -f serverstarter-2.1.1.jar ]; then - echo "Skipping download. Using existing serverstarter-2.1.1.jar" - java -jar serverstarter-2.1.1.jar - if [[ $DO_RAMDISK -eq 1 ]]; then - sudo umount $SAVE_DIR - rm -rf $SAVE_DIR - mv "${SAVE_DIR}_backup" $SAVE_DIR - fi - exit 0 - else - export URL="https://github.com/TeamAOF/ServerStarter/releases/download/v2.1.1/serverstarter-2.1.1.jar" - fi - echo $URL - which wget >> /dev/null - if [ $? -eq 0 ]; then - echo "DEBUG: (wget) Downloading ${URL}" - wget -O serverstarter-2.1.1.jar "${URL}" - else - which curl >> /dev/null - if [ $? -eq 0 ]; then - echo "DEBUG: (curl) Downloading ${URL}" - curl -o serverstarter-2.1.1.jar "${URL}" - else - echo "Neither wget or curl were found on your system. Please install one and try again" - fi - fi + +if [ -f serverstarter-2.1.1.jar ]; then + echo "Skipping download. Using existing serverstarter-2.1.1.jar" + java -jar serverstarter-2.1.1.jar + if [[ $DO_RAMDISK -eq 1 ]]; then + sudo umount $SAVE_DIR + rm -rf $SAVE_DIR + mv "${SAVE_DIR}_backup" $SAVE_DIR + fi + exit 0 +else + export URL="https://github.com/TeamAOF/ServerStarter/releases/download/v2.1.1/serverstarter-2.1.1.jar" +fi +echo $URL +which wget >> /dev/null +if [ $? -eq 0 ]; then + echo "DEBUG: (wget) Downloading ${URL}" + wget -O serverstarter-2.1.1.jar "${URL}" +else + which curl >> /dev/null + if [ $? -eq 0 ]; then + echo "DEBUG: (curl) Downloading ${URL}" + curl -o serverstarter-2.1.1.jar "${URL}" + else + echo "Neither wget or curl were found on your system. Please install one and try again" + fi +fi java -jar serverstarter-2.1.1.jar if [[ $DO_RAMDISK -eq 1 ]]; then sudo umount $SAVE_DIR