From 25d334b6589a78adefa92e4e210b6b802e3f69e1 Mon Sep 17 00:00:00 2001
From: Onimaro <onimaro@protonmail.com>
Date: Tue, 15 May 2018 20:34:40 +0200
Subject: [PATCH 1/7] Erreur de sequencage corrigee

---
 DST/DST_maj.sh          | 8 ++++----
 DST/DST_server_start.sh | 2 +-
 DST/game.params.ori     | 1 -
 DST/game_globals        | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DST/DST_maj.sh b/DST/DST_maj.sh
index 4ce7fbe..6e91de8 100755
--- a/DST/DST_maj.sh
+++ b/DST/DST_maj.sh
@@ -2,13 +2,13 @@
 source $(dirname $0)/game_globals
 #[ ! -r "$(dirname $0)/game.params.ori" ] && echo "Fichier de parameteres manquant : $(dirname $0)/game.params.ori" && exit 2
 if [ ! -r "$(dirname $0)/../../params/${GAME_NAME}.params" ]; then
-       echo "Mise en place du fichier de parametres dans $( cd $(dirname $0)/../../ && pwd)/params/)"
-       mkdir -p $(dirname $0)/../../params || echo "Echec de creation ou de verification du repertoire $(dirname $0)/../../params" && exit 3
-       cp $(dirname $0)/game.params.ori $(dirname $0)/../../params/${GAME_NAME}.params || echo "Echec de generation du fichier de parametres standard $(dirname $0)/../../params/${GAME_NAME}.params" && exit 4
+       echo "Mise en place du fichier de parametres dans $(dirname $0)/../../params/"
+       mkdir -p $(dirname $0)/../../params || (echo "Echec de creation ou de verification du repertoire $(dirname $0)/../../params" && exit 3)
+       cp $(dirname $0)/game.params.ori $(dirname $0)/../../params/${GAME_NAME}.params || (echo "Echec de generation du fichier de parametres standard $(dirname $0)/../../params/${GAME_NAME}.params" && exit 4)
        echo "Veuillez configurer le jeu si besoin via le fichier $( ls $(dirname $0)/../../params/${GAME_NAME}.params) puis relancer le script de MAJ"
        exit 0
 fi
-source $(dirname $0)/../../params/${GAME_NAME}.params || echo "Impossible de charger les parametres du jeu via $(dirname $0)/../../params/${GAME_NAME}.params" && exit 5
+source $(dirname $0)/../../params/${GAME_NAME}.params || (echo "Impossible de charger les parametres du jeu via $(dirname $0)/../../params/${GAME_NAME}.params" && exit 5)
 [ ! -d "${GAME_PATH}" ] && echo "creation du repertoire de jeu ${GAME_PATH}"
 [ -z ${GAME_STEAMID} ] && "Missing App SteamID" && exit 7
 echo "Mise a jour du jeu ..."
diff --git a/DST/DST_server_start.sh b/DST/DST_server_start.sh
index afe2bf3..f979176 100755
--- a/DST/DST_server_start.sh
+++ b/DST/DST_server_start.sh
@@ -2,8 +2,8 @@
 
 serveur=$1
 reset=$2
-[ ${serveur} == "-h" ] && echo "Liste des serveurs :" && echo "$(ls ~steamcmd/.klei/DoNotStarveTogether/)" && exit 0
 [ -z ${serveur} ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 1
+[ ${serveur} == "-h" ] && echo "Liste des serveurs :" && echo "$(ls ~steamcmd/.klei/DoNotStarveTogether/)" && exit 0
 [ ${serveur} == "-reset" ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 2
 [ ! -z ${reset} ] && [ ${reset} != "-reset" ] && echo "Le deuxieme parametre doit etre -reset ou rien" && exit 3
 echo
diff --git a/DST/game.params.ori b/DST/game.params.ori
index 5d4787d..88c590c 100644
--- a/DST/game.params.ori
+++ b/DST/game.params.ori
@@ -2,4 +2,3 @@ GAME_PATH="~/jeux/server_${GAME_NAME}"
 LOG_PATH="~/logs/${GAME_NAME}"
 GAME_BIN="${GAME_PATH}/bin/dontstarve_dedicated_server_nullrenderer"
 GAME_PARAMS="-console -cluster ${serveur}Cluster -shard ${shard}"
-GAME_STEAMID=343050
diff --git a/DST/game_globals b/DST/game_globals
index 16b48f0..59dc5c0 100644
--- a/DST/game_globals
+++ b/DST/game_globals
@@ -1,2 +1,3 @@
 GAME_NAME='DST'
 STEAMCMD=~/steamcmd/steamcmd.sh
+GAME_STEAMID=343050

From acdc7add69ef5823b59bcdde01d66a1a48b18bad Mon Sep 17 00:00:00 2001
From: Onimaro <onimaro@protonmail.com>
Date: Tue, 15 May 2018 20:39:11 +0200
Subject: [PATCH 2/7] encore des erreurs a la con

---
 DST/DST.params | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/DST/DST.params b/DST/DST.params
index aadc49c..9da8d54 100644
--- a/DST/DST.params
+++ b/DST/DST.params
@@ -1,5 +1,5 @@
-GAME_NAME=DST
-GAME_STEAMID=343050
-GAME_PATH=/jeux/server_dst/
-LOG_PATH=~/logs/${GAME_NAME}/
-STEAMCMD=/home/steamcmd/steamcmd.sh
+export GAME_NAME=DST
+export GAME_STEAMID=343050
+export GAME_PATH=/jeux/server_dst/
+export LOG_PATH=~/logs/${GAME_NAME}/
+export STEAMCMD=/home/steamcmd/steamcmd.sh

From d863587453a703a8c50c9e4dedafda36e8403681 Mon Sep 17 00:00:00 2001
From: Onimaro <onimaro@protonmail.com>
Date: Tue, 15 May 2018 20:40:04 +0200
Subject: [PATCH 3/7] encore des erreurs a la con

---
 ARK/game.params.ori | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ARK/game.params.ori b/ARK/game.params.ori
index bebe5c1..7a09434 100644
--- a/ARK/game.params.ori
+++ b/ARK/game.params.ori
@@ -1,10 +1,10 @@
-GAME_STEAMID=376030
-GAME_PATH=~/jeux/server_${GAME_NAME}
-LOG_PATH=~/logs/${GAME_NAME}
-GAME_BIN=${GAME_PATH}/ShooterGame/Binaries/Linux/ShooterGameServer
-SERVER_NAME=PATATE_Onimaro
-#GAME_PORT will be the specified port and the following (here 7779 and 7780)
-GAME_PORT=7779
-#QUERY_PORT is the port used by steam to connect players to your server
-QUERY_PORT=27015
-GAME_PARAMS="TheIsland?listen?Port=${GAME_PORT}?QueryPort=${QUERY_PORT}?SessionName=${SERVER_NAME}?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log"
+export GAME_STEAMID=376030
+export GAME_PATH=~/jeux/server_${GAME_NAME}
+export LOG_PATH=~/logs/${GAME_NAME}
+export GAME_BIN=${GAME_PATH}/ShooterGame/Binaries/Linux/ShooterGameServer
+export SERVER_NAME=PATATE_Onimaro
+export #GAME_PORT will be the specified port and the following (here 7779 and 7780)
+export GAME_PORT=7779
+export #QUERY_PORT is the port used by steam to connect players to your server
+export QUERY_PORT=27015
+export GAME_PARAMS="TheIsland?listen?Port=${GAME_PORT}?QueryPort=${QUERY_PORT}?SessionName=${SERVER_NAME}?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log"

From ced09dd91bdb3cc77031316d9f45899347d83ecc Mon Sep 17 00:00:00 2001
From: Onimaro <onimaro@protonmail.com>
Date: Tue, 15 May 2018 20:51:16 +0200
Subject: [PATCH 4/7] miase a jour du script de demarrage (tout le monde kiffe
 les miases)

---
 DST/$                   | 33 +++++++++++++++++++++++++++++++++
 DST/DST_server_start.sh |  6 +++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 DST/$

diff --git a/DST/$ b/DST/$
new file mode 100644
index 0000000..278c14a
--- /dev/null
+++ b/DST/$
@@ -0,0 +1,33 @@
+#!/bin/bash
+serveur=$1
+reset=$2
+
+source $(dirname $0)/game_globals
+[ ! -r "$(dirname $0)/../../params/${GAME_NAME}.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/../../params/${GAME_NAME}.params" && exit 2
+source $(dirname $0)/../../params/${GAME_NAME}.params
+
+[ -z ${serveur} ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 1
+[ ${serveur} == "-h" ] && echo "Liste des serveurs :" && echo "$(ls ~steamcmd/.klei/DoNotStarveTogether/)" && exit 0
+[ ${serveur} == "-reset" ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 2
+[ ! -z ${reset} ] && [ ${reset} != "-reset" ] && echo "Le deuxieme parametre doit etre -reset ou rien" && exit 3
+echo
+echo
+echo "############################################"
+echo "#                                          #"
+echo "#        Demarrage des serveurs DST        #"
+echo "#                                          #"
+echo "############################################"
+echo
+echo "  Serveur ${serveur}"
+echo
+[ ! -z ${reset} ] && [ ${reset} == "-reset" ] && echo "Remise a zero du serveur." && rm -rf ~steamcmd/.klei/DoNotStarveTogether/${serveur}Cluster/Master/save/session/* && rm -rf ~steamcmd/.klei/DoNotStarveTogether/${serveur}Cluster/Caves/save/session/*
+echo
+cd ${GAME_PATH}/bin
+echo
+echo "  --- Don't Starve Together, exterieur "
+$(dirname $0)/DST_shard_start.sh ${serveur} Master
+sleep 15
+echo
+echo "  ----- Don't Starve Together, caves "
+$(dirname $0)/DST_shard_start.sh ${serveur} Caves
+echo "Serveur demarre"
diff --git a/DST/DST_server_start.sh b/DST/DST_server_start.sh
index f979176..278c14a 100755
--- a/DST/DST_server_start.sh
+++ b/DST/DST_server_start.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
-
 serveur=$1
 reset=$2
+
+source $(dirname $0)/game_globals
+[ ! -r "$(dirname $0)/../../params/${GAME_NAME}.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/../../params/${GAME_NAME}.params" && exit 2
+source $(dirname $0)/../../params/${GAME_NAME}.params
+
 [ -z ${serveur} ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 1
 [ ${serveur} == "-h" ] && echo "Liste des serveurs :" && echo "$(ls ~steamcmd/.klei/DoNotStarveTogether/)" && exit 0
 [ ${serveur} == "-reset" ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 2

From 044887164b2b25b4a69d03c0713bf3a28e5ee601 Mon Sep 17 00:00:00 2001
From: Onimaro <onimaro@protonmail.com>
Date: Tue, 15 May 2018 23:33:40 +0200
Subject: [PATCH 5/7] bordel

---
 DST/$                   | 33 ---------------------------------
 DST/DST.params          |  8 ++++----
 DST/DST_maj.sh          |  2 +-
 DST/DST_server_start.sh |  2 ++
 DST/game.params.ori     |  8 ++++----
 5 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 DST/$

diff --git a/DST/$ b/DST/$
deleted file mode 100644
index 278c14a..0000000
--- a/DST/$
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-serveur=$1
-reset=$2
-
-source $(dirname $0)/game_globals
-[ ! -r "$(dirname $0)/../../params/${GAME_NAME}.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/../../params/${GAME_NAME}.params" && exit 2
-source $(dirname $0)/../../params/${GAME_NAME}.params
-
-[ -z ${serveur} ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 1
-[ ${serveur} == "-h" ] && echo "Liste des serveurs :" && echo "$(ls ~steamcmd/.klei/DoNotStarveTogether/)" && exit 0
-[ ${serveur} == "-reset" ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 2
-[ ! -z ${reset} ] && [ ${reset} != "-reset" ] && echo "Le deuxieme parametre doit etre -reset ou rien" && exit 3
-echo
-echo
-echo "############################################"
-echo "#                                          #"
-echo "#        Demarrage des serveurs DST        #"
-echo "#                                          #"
-echo "############################################"
-echo
-echo "  Serveur ${serveur}"
-echo
-[ ! -z ${reset} ] && [ ${reset} == "-reset" ] && echo "Remise a zero du serveur." && rm -rf ~steamcmd/.klei/DoNotStarveTogether/${serveur}Cluster/Master/save/session/* && rm -rf ~steamcmd/.klei/DoNotStarveTogether/${serveur}Cluster/Caves/save/session/*
-echo
-cd ${GAME_PATH}/bin
-echo
-echo "  --- Don't Starve Together, exterieur "
-$(dirname $0)/DST_shard_start.sh ${serveur} Master
-sleep 15
-echo
-echo "  ----- Don't Starve Together, caves "
-$(dirname $0)/DST_shard_start.sh ${serveur} Caves
-echo "Serveur demarre"
diff --git a/DST/DST.params b/DST/DST.params
index 9da8d54..ca7fa1c 100644
--- a/DST/DST.params
+++ b/DST/DST.params
@@ -1,5 +1,5 @@
-export GAME_NAME=DST
+export GAME_NAME='DST'
 export GAME_STEAMID=343050
-export GAME_PATH=/jeux/server_dst/
-export LOG_PATH=~/logs/${GAME_NAME}/
-export STEAMCMD=/home/steamcmd/steamcmd.sh
+export GAME_PATH="~/jeux/server_dst/"
+export LOG_PATH="~/logs/${GAME_NAME}/"
+export STEAMCMD="~/steamcmd/steamcmd.sh"
diff --git a/DST/DST_maj.sh b/DST/DST_maj.sh
index 6e91de8..12b8eff 100755
--- a/DST/DST_maj.sh
+++ b/DST/DST_maj.sh
@@ -9,7 +9,7 @@ if [ ! -r "$(dirname $0)/../../params/${GAME_NAME}.params" ]; then
        exit 0
 fi
 source $(dirname $0)/../../params/${GAME_NAME}.params || (echo "Impossible de charger les parametres du jeu via $(dirname $0)/../../params/${GAME_NAME}.params" && exit 5)
-[ ! -d "${GAME_PATH}" ] && echo "creation du repertoire de jeu ${GAME_PATH}"
+[ ! -d "${GAME_PATH}" ] && echo "creation du repertoire de jeu ${GAME_PATH}" && mkdir -p ${GAME_PATH}
 [ -z ${GAME_STEAMID} ] && "Missing App SteamID" && exit 7
 echo "Mise a jour du jeu ..."
 echo "${STEAMCMD} +login anonymous +force_install_dir ${GAME_PATH} +app_update ${GAME_STEAMID} +quit"
diff --git a/DST/DST_server_start.sh b/DST/DST_server_start.sh
index 278c14a..6fe50d7 100755
--- a/DST/DST_server_start.sh
+++ b/DST/DST_server_start.sh
@@ -22,6 +22,8 @@ echo "  Serveur ${serveur}"
 echo
 [ ! -z ${reset} ] && [ ${reset} == "-reset" ] && echo "Remise a zero du serveur." && rm -rf ~steamcmd/.klei/DoNotStarveTogether/${serveur}Cluster/Master/save/session/* && rm -rf ~steamcmd/.klei/DoNotStarveTogether/${serveur}Cluster/Caves/save/session/*
 echo
+echo "GAME_PATH : ${GAME_PATH}"
+echo
 cd ${GAME_PATH}/bin
 echo
 echo "  --- Don't Starve Together, exterieur "
diff --git a/DST/game.params.ori b/DST/game.params.ori
index 88c590c..763a5a0 100644
--- a/DST/game.params.ori
+++ b/DST/game.params.ori
@@ -1,4 +1,4 @@
-GAME_PATH="~/jeux/server_${GAME_NAME}"
-LOG_PATH="~/logs/${GAME_NAME}"
-GAME_BIN="${GAME_PATH}/bin/dontstarve_dedicated_server_nullrenderer"
-GAME_PARAMS="-console -cluster ${serveur}Cluster -shard ${shard}"
+GAME_PATH=~/jeux/server_${GAME_NAME}
+LOG_PATH=~/logs/${GAME_NAME}
+GAME_BIN=${GAME_PATH}/bin/dontstarve_dedicated_server_nullrenderer
+GAME_PARAMS=-console -cluster ${serveur}Cluster -shard ${shard}

From db1b41ea9b8fef88263fe2ad2607048a42af7fe6 Mon Sep 17 00:00:00 2001
From: Onimaro <onimaro@protonmail.com>
Date: Tue, 15 May 2018 23:48:53 +0200
Subject: [PATCH 6/7] exporter, c'est bien

---
 DST/game.params.ori | 8 ++++----
 DST/game_globals    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/DST/game.params.ori b/DST/game.params.ori
index 763a5a0..345ccfa 100644
--- a/DST/game.params.ori
+++ b/DST/game.params.ori
@@ -1,4 +1,4 @@
-GAME_PATH=~/jeux/server_${GAME_NAME}
-LOG_PATH=~/logs/${GAME_NAME}
-GAME_BIN=${GAME_PATH}/bin/dontstarve_dedicated_server_nullrenderer
-GAME_PARAMS=-console -cluster ${serveur}Cluster -shard ${shard}
+export GAME_PATH=~/jeux/server_${GAME_NAME}
+export LOG_PATH=~/logs/${GAME_NAME}
+export GAME_BIN=${GAME_PATH}/bin/dontstarve_dedicated_server_nullrenderer
+export GAME_PARAMS=-console -cluster ${serveur}Cluster -shard ${shard}
diff --git a/DST/game_globals b/DST/game_globals
index 59dc5c0..2028719 100644
--- a/DST/game_globals
+++ b/DST/game_globals
@@ -1,3 +1,3 @@
-GAME_NAME='DST'
-STEAMCMD=~/steamcmd/steamcmd.sh
-GAME_STEAMID=343050
+export GAME_NAME='DST'
+export STEAMCMD=~/steamcmd/steamcmd.sh
+export GAME_STEAMID=343050

From 4f0f0b6cb15091e3cb2eeba5038af48f1798b31b Mon Sep 17 00:00:00 2001
From: Onimaro <onimaro@protonmail.com>
Date: Thu, 24 May 2018 15:24:21 +0200
Subject: [PATCH 7/7] faute de frappe ?

---
 DST/game_globals | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DST/game_globals b/DST/game_globals
index 2028719..1b8934e 100644
--- a/DST/game_globals
+++ b/DST/game_globals
@@ -1,3 +1,3 @@
 export GAME_NAME='DST'
 export STEAMCMD=~/steamcmd/steamcmd.sh
-export GAME_STEAMID=343050
+export GAME_STEAMID='343050'