From a09fe6326bcf280704748c0af49dba344decaaf6 Mon Sep 17 00:00:00 2001 From: fithwum Date: Tue, 28 Jul 2026 11:47:00 -0700 Subject: [PATCH] update --- latest/install_script.sh | 16 ++++++++-------- latest/start.sh | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/latest/install_script.sh b/latest/install_script.sh index ca9f2ba..139ea77 100644 --- a/latest/install_script.sh +++ b/latest/install_script.sh @@ -2,11 +2,11 @@ # Copyright (c) 2026 fithwum # All rights reserved -MARKER_FILE=$VS_SERVER_DIR/.setup_done VS_SERVER_DIR=/vs_server/server VS_DATA_DIR=/vs_server/server/data -START_FILE=$VS_SERVER_DIR/server-$VS_VERSION.sh LOG_FILE=$VS_DATA_DIR/Logs/server-main.log +MARKER_FILE=$VS_SERVER_DIR/.setup_done +START_FILE_1=$VS_SERVER_DIR/server-$VS_VERSION.sh START_FILE_2=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/main/latest/start.sh VS_SERVER_FILE=https://cdn.vintagestory.at/gamefiles/$VS_CHANNEL/vs_server_linux-x64_$VS_VERSION.tar.gz MS_REPO_URL=https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb @@ -62,7 +62,7 @@ fi # Main install (Debian). # Check for server files and download if needed. -if [ -e $START_FILE ] +if [ -e $START_FILE_1 ] then echo " " echo "INFO ! server-$VS_VERSION.sh found starting now." @@ -79,14 +79,14 @@ if [ -e $START_FILE ] tar -xzf /vstemp/vs_server_linux-x64_$VS_VERSION.tar.gz -C /vstemp/files rm -fr /vstemp/*.tar.gz mv -uf /vstemp/files/* $VS_SERVER_DIR/ - mv $VS_SERVER_DIR/server.sh $START_FILE - chmod +x $START_FILE + mv $VS_SERVER_DIR/server.sh $START_FILE_1 + chmod +x $START_FILE_1 fi echo "INFO ! Setting server path." -sed -i -E "s|^VSPATH='/home/vintagestory/server'|VSPATH='$VS_SERVER_DIR'|" $START_FILE +sed -i -E "s|^VSPATH='/home/vintagestory/server'|VSPATH='$VS_SERVER_DIR'|" $START_FILE_1 echo "INFO ! Setting data path." -sed -i -E "s|^DATAPATH='/var/vintagestory/data'|DATAPATH='$VS_DATA_DIR'|" $START_FILE +sed -i -E "s|^DATAPATH='/var/vintagestory/data'|DATAPATH='$VS_DATA_DIR'|" $START_FILE_1 # Set permissions. chown 99:100 -R $VS_SERVER_DIR @@ -114,7 +114,7 @@ exec $VS_SERVER_DIR/start.sh # echo " " # echo "INFO ! Starting vintage-story Server $VS_VERSION" -# .$VS_SERVER_DIR/server-$VS_VERSION.sh start +# .$START_FILE_1 start # echo "Waiting for the server log file to be created..." # # Loop indefinitely until the log file actually exists on disk diff --git a/latest/start.sh b/latest/start.sh index 1e7dd8e..d0ad764 100644 --- a/latest/start.sh +++ b/latest/start.sh @@ -5,8 +5,6 @@ LOG_FILE=/vs_server/server/data/Logs/server-main.log SESSION=server -# cd /vs_server/server - echo "INFO ! A screen session for the Vintage-Story server is already running." cleanup() { echo "[INFO] Stopping Vintage-Story ..."