fix: Removed -beta from branch, it isn't requiered also removed dupli…

…cated code. (#247) Thanks to @karcsesz
vinanrra · Jun 24, 2024 · 317509b · 317509b
1 parent 615d2a4
commit 317509b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 37 deletions.
diff --git a/scripts/first_install.sh b/scripts/first_install.sh
@@ -25,25 +25,7 @@ then
 fi
 
 # Check version
-
-if [ "${VERSION,,}" == 'stable'  ] || [ "${VERSION,,}" == 'public'  ]
-    then
-        if grep -R "branch" "$LSGMSDTDSERVERCFG"
-            then
-                sed -i "s/branch=.*/branch=\"\"/" $LSGMSDTDSERVERCFG
-                echo "[INFO] Version changed to ${VERSION,,}"
-            else
-                echo "[INFO] Selecting 7 days to die ${VERSION,,} version"
-        fi
-    else
-        if grep -R "branch" "$LSGMSDTDSERVERCFG"
-            then
-                sed -i "s/branch=".*"/branch=\"-beta ${VERSION,,}"\"/ $LSGMSDTDSERVERCFG
-            else
-                echo branch=\"-beta "${VERSION}"\" >> $LSGMSDTDSERVERCFG
-                echo "[INFO] Selecting 7 days to die ${VERSION,,} version"
-        fi
-fi
+source $scriptsDir/utils/set_version.sh
 
 echo "[INFO] Installing 7 days to die ${VERSION,,} version"
 

diff --git a/scripts/server_update.sh b/scripts/server_update.sh
@@ -2,24 +2,7 @@
 BASEPATH=/home/sdtdserver
 LSGMSDTDSERVERCFG=${BASEPATH}/lgsm/config-lgsm/sdtdserver/sdtdserver.cfg
 
-if [ "${VERSION,,}" == 'stable'  ] || [ "${VERSION,,}" == 'public'  ]
-    then
-        if grep -R "branch" "$LSGMSDTDSERVERCFG"
-            then
-                sed -i "s/branch=.*/branch=\"\"/" $LSGMSDTDSERVERCFG
-                echo "[INFO] Version changed to ${VERSION,,}"
-            else
-                echo "[INFO] Selecting 7 days to die ${VERSION,,} version"
-        fi
-    else
-        if grep -R "branch" "$LSGMSDTDSERVERCFG"
-            then
-                sed -i "s/branch=".*"/branch=\"-beta ${VERSION,,}"\"/ $LSGMSDTDSERVERCFG
-            else
-                echo branch=\"-beta "${VERSION}"\" >> $LSGMSDTDSERVERCFG
-                echo "[INFO] Selecting 7 days to die ${VERSION,,} version"
-        fi
-fi
+source $scriptsDir/utils/set_version.sh
 
 ./sdtdserver update
 

diff --git a/scripts/utils/set_version.sh b/scripts/utils/set_version.sh
@@ -0,0 +1,18 @@
+if [ "${VERSION,,}" == 'stable'  ] || [ "${VERSION,,}" == 'public'  ]
+    then
+        if grep -R "branch" "$LSGMSDTDSERVERCFG"
+            then
+                sed -i "s/branch=.*/branch=\"\"/" $LSGMSDTDSERVERCFG
+                echo "[INFO] Version changed to ${VERSION,,}"
+            else
+                echo "[INFO] Selecting 7 days to die ${VERSION,,} version"
+        fi
+    else
+        if grep -R "branch" "$LSGMSDTDSERVERCFG"
+            then
+                sed -i "s/branch=".*"/branch=\"${VERSION,,}"\"/ $LSGMSDTDSERVERCFG
+            else
+                echo branch=\""${VERSION}"\" >> $LSGMSDTDSERVERCFG
+                echo "[INFO] Selecting 7 days to die ${VERSION,,} version"
+        fi
+fi