Compare commits
11
Commits
ef0edf8895
...
14c37d1e66
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14c37d1e66 | ||
|
|
a09fe6326b | ||
|
|
211d66b353 | ||
|
|
2d46ec0f7c | ||
|
|
83441fe6ce | ||
|
|
9790e7dbd9 | ||
|
|
d7c7d743fe | ||
|
|
847d73e539 | ||
|
|
905fce1f66 | ||
|
|
3d8511dc08 | ||
|
|
c8c1c3a2ca |
+2
-2
@@ -1,5 +1,5 @@
|
||||
## 2026-07-28T18:21:49Z
|
||||
## 2026-07-28T18:47:53Z
|
||||
|
||||
- update (fithwum)
|
||||
- Merge build-info updates (fithwum)
|
||||
- Update build-info on 2026-07-28T18:18:04Z [skip ci] (fithwum)
|
||||
- Update build-info on 2026-07-28T18:35:09Z [skip ci] (fithwum)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version": "latest",
|
||||
"commit": "6f9ba1c115bc1bc9007864a888685b65a0b69d15",
|
||||
"build_time": "2026-07-28T18:22:00Z",
|
||||
"commit": "83441fe6ceccf253edc76d8d356ad4b621cdb814",
|
||||
"build_time": "2026-07-28T18:35:09Z",
|
||||
"image_tag": "gitea.fithwum.tech/fithwum/vintage-story:latest",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:19476f42ef77d353a8e2e847d6eb503c36255bd211d0eb09e373c9c136c5e14e",
|
||||
"digest": "gitea.fithwum.tech/fithwum/vintage-story@sha256:20819ecdbc199a78b1d56d5dca1a4388bddf9c5380dd4b92dc2f8d9860e11e94",
|
||||
"image_size": "410MB",
|
||||
"image_size_bytes": 430944219
|
||||
"image_size_bytes": 430958207
|
||||
}
|
||||
|
||||
+12
-13
@@ -2,12 +2,12 @@
|
||||
# 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
|
||||
START_FILE=https://gitea.fithwum.tech/fithwum/vintage-story/raw/branch/main/latest/start.sh
|
||||
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
|
||||
USERNAME=adduser vintagestory
|
||||
@@ -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
|
||||
@@ -101,21 +101,20 @@ if [ ! -f $MARKER_FILE ]; then
|
||||
fi
|
||||
|
||||
# Download the start file for the screen session
|
||||
if [ -f $VS_SERVER_DIR/start.sh ]; then
|
||||
if [ -f $START_FILE_2 ]; then
|
||||
echo "INFO ! start.sh found ... moving on."
|
||||
else
|
||||
echo "WARNING ! start.sh missing ... downloading default file."
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $START_FILE -O $VS_SERVER_DIR/start.sh
|
||||
wget --no-cache --show-progress --progress=bar:force:noscroll $START_FILE_2 -O $VS_SERVER_DIR/start.sh
|
||||
chmod +x $VS_SERVER_DIR/start.sh
|
||||
fi
|
||||
|
||||
# Run vintage-story server.
|
||||
cd $VS_SERVER_DIR
|
||||
exec ./start.sh
|
||||
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
|
||||
|
||||
@@ -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 ..."
|
||||
|
||||
Reference in New Issue
Block a user