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] 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