Merge pull request #2 from vinanrra/v0.0.2

Fixed server version

Author: vinanrra

Dockerfile

@@ -51,7 +51,7 @@ ENV PGID=1000
 ENV START_MODE=1
 ENV TEST_ALERT=no
 ENV TimeZone=Europe/Madrid
-ENV VERSION=stable
+ENV VERSION=public
 ENV MONITOR=yes
 ENV BACKUP=yes
 ENV LANG=en_US.utf8

README.md

@@ -33,6 +33,7 @@ docker run -d \
   -p 7777:7777/udp \
   -e START_MODE=1 \
   -e TEST_ALERT=NO \
+  -e VERSION=public \
   -e BACKUP=YES \
   -e MONITOR=YES \
   -e PUID=1000 \
@@ -57,6 +58,7 @@ services:
       - TEST_ALERT=NO
       - BACKUP=YES # Backup server at 5 AM
       - MONITOR=YES # Keeps server up if crash
+      - VERSION=public # Change between server versions
     volumes:
       - ./ServerFiles:/home/sfserver/serverfiles/ #Optional, serverfiles
       - ./log:/home/sfserver/log/ #Optional, logs
@@ -84,8 +86,9 @@ services:
 | `TEST_ALERT=YES` | Test alerts at start of server **optional** |
 | `BACKUP=YES` | Backup server at 5 AM (Only the latest 5 backups will be keep, maximum 30 days) [More info](https://docs.linuxgsm.com/commands/backup) **optional** |
 | `MONITOR=YES` | Monitor server status, if server crash this will restart it [More info](https://docs.linuxgsm.com/commands/monitor) **optional** |
-| `PUID=1000` | for UserID - see below for explanation |
-| `PGID=1000` | for GroupID - see below for explanation |
+| `VERSION=public` | Change server version, check [Branches](https://steamdb.info/app/1690800/depots/) to know the names **optional** |
+| `PUID=1000` | for UserID - see below for explanation **optional** |
+| `PGID=1000` | for GroupID - see below for explanation **optional** |
 | `TimeZone=Europe/Madrid` | for TimeZone - see [TZ Database](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) for time zones **recomendable**|
 | `--restart unless-stopped` | Restart container always unlesss stopped manually **NEVER USE WITH START_MODE=4** |
 

scripts/first_install.sh

@@ -43,6 +43,8 @@ source $scriptsDir/check_space.sh
 
             mv -f common.cfg /home/sfserver/lgsm/config-lgsm/sfserver/common.cfg
 
+            sed -i "s/branch=".*"/branch="\"${VERSION,,}"\"/" /home/sfserver/lgsm/config-lgsm/sfserver/common.cfg
+
 	# Install Satisfactory Server
 
             ./sfserver auto-install

scripts/server_update.sh

@@ -1,15 +1,13 @@
 #!/bin/bash
 ./sfserver update
 
-        if [ "${VERSION,,}" == 'stable'  ]
+        if [ "${VERSION,,}" == 'public'  ]
         then
 	    # Remove branch line
-            sed -i '/branch/d' /home/sfserver/lgsm/config-lgsm/sfserver/sfserver.cfg
+            sed -i 's/branch=".*"/branch=""/' /home/sfserver/lgsm/config-lgsm/sfserver/common.cfg
         else
 	    # Remove branch line if exist to avoid multiple branch lines
-	    sed -i '/branch/d' /home/sfserver/lgsm/config-lgsm/sfserver/sfserver.cfg
-	    
-            echo branch='"-beta $VERSION"' >> /home/sfserver/lgsm/config-lgsm/sfserver/sfserver.cfg
+	        sed -i "s/branch=".*"/branch="\"${VERSION,,}"\"/" /home/sfserver/lgsm/config-lgsm/sfserver/common.cfg
 
             echo "
             =======================================================================
@@ -27,7 +25,7 @@
             =======================================================================
             IMPORTANT:
 
-            The server have been updated to ${VERSION,,}
+            The server have been updated to latest ${VERSION,,} version
             More info: https://github.com/vinanrra/Docker-Satisfactory#start-modes
             =======================================================================
             "