From 4445143900b97812e2bbed417a2e15f560acd524 Mon Sep 17 00:00:00 2001
From: leiflundgren <leiflundgren@users.noreply.github.com>
Date: Tue, 30 May 2023 00:02:40 +0200
Subject: [PATCH] Newer steamcmd requires force_install_dir before login
 command (#137)

* fixes #1  Newer steamcmd requires force_install_dir before login command
Changed the order of the commands

* fixes #1 Newer steamcmd requires force_install_dir before login command
- update docker_start.sh too
---
 admin-interface/docroot/views/steamcmd-tool.erb | 2 +-
 admin-interface/lib/server-updater.rb           | 2 +-
 docker_start.sh                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-interface/docroot/views/steamcmd-tool.erb b/admin-interface/docroot/views/steamcmd-tool.erb
index e83c0b8..94f756c 100644
--- a/admin-interface/docroot/views/steamcmd-tool.erb
+++ b/admin-interface/docroot/views/steamcmd-tool.erb
@@ -8,8 +8,8 @@
       <div class="p-2 col-2">Command</div>
       <div class="p-2 horizontal-expand">
 <textarea id="steamcmd_input" class="form-control monospace-font" id="exampleTextarea" rows="8">
-+login anonymous
 +force_install_dir "<%= @server_root_dir %>"
++login anonymous
 +app_update 581330 validate
 +exit
 </textarea>
diff --git a/admin-interface/lib/server-updater.rb b/admin-interface/lib/server-updater.rb
index 1ba614b..40d96be 100644
--- a/admin-interface/lib/server-updater.rb
+++ b/admin-interface/lib/server-updater.rb
@@ -138,8 +138,8 @@ def run_steamcmd(command, buffer: nil, ignore_status: false, ignore_message: fal
   def update_server(buffer=nil, validate: nil, ignore_status: true, ignore_message: true)
     log 'Updating server', level: :info
     command = [
-      '+login anonymous',
       "+force_install_dir \"#{@server_root_dir}\"",
+      '+login anonymous',
       "+app_update 581330#{' validate' if validate}",
       '+exit'
     ]
diff --git a/docker_start.sh b/docker_start.sh
index 63147a9..dcbea62 100755
--- a/docker_start.sh
+++ b/docker_start.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-# Install the server if not already installed
+# Install the server if not already installed 
 if [[ ! -d sandstorm-server/Insurgency ]]
 then
-  steamcmd/installation/steamcmd.sh +login anonymous +force_install_dir /home/sandstorm/sandstorm-server +app_update 581330 +quit
+  steamcmd/installation/steamcmd.sh +force_install_dir +login anonymous /home/sandstorm/sandstorm-server +app_update 581330 +quit
 fi
 
 # Start normally