tentative de mise a jour ou regression massive

2018-05-15 10:49:41 +02:00 · 2018-05-15 10:49:41 +02:00 · a1a097f009
parent 33b5e6cbe4
commit a1a097f009
14 changed files with 55 additions and 97 deletions
--- a/ARK/ARK_maj.sh
+++ b/ARK/ARK_maj.sh
@ -1,9 +1,16 @@
 #!/bin/bash
-
-[ ! -r "$(dirname $0)/game.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/game.params" && exit 2
-source $(dirname $0)/game.params
-[ ! -d "${GAME_PATH}" ] && echo "Missing GAME_PATH ${GAME_PATH}" && exit 3
-[ -z ${GAME_STEAMID} ] && "Missing App SteamID"
-[ ! -d "${GAME_PATH}" ] && mkdir -p ${GAME_PATH}
+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 "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
+[ ! -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 ..."
 echo "${STEAMCMD} +login anonymous +force_install_dir ${GAME_PATH} +app_update ${GAME_STEAMID} +quit"
 ${STEAMCMD} +login anonymous +force_install_dir ${GAME_PATH} +app_update ${GAME_STEAMID} +quit
--- a/ARK/ARK_server_start.sh
+++ b/ARK/ARK_server_start.sh
@ -1,10 +1,10 @@
 #!/bin/bash
-
-[ ! -r "$(dirname $0)/game.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/game.params" && exit 2
-source $(dirname $0)/game.params
+source $(dirname $0)/game_globals
+[ ! -r "$(dirname $0)/../../${GAME_NAME}.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/../../${GAME_NAME}.params" && exit 2
+source $(dirname $0)/../../${GAME_NAME}.params
 [ ! -d ${LOG_PATH} ] && mkdir -p ${LOG_PATH}
 [ ! -x ${GAME_BIN} ] && echo "Le binaire du jeu n'existe pas : ${GAME_BIN}"

 echo "Lancemement du serveur..."
 echo "${GAME_BIN} ${GAME_PARAMS}"
-nohup ${GAME_BIN} ${GAME_PARAMS} >> ${LOG_PATH}/ark_server.log 2>> ${LOG_PATH}/ark_server.err &
+nohup ${GAME_BIN} ${GAME_PARAMS} >> ${LOG_PATH}/${GAME_NAME}_server.log 2>> ${LOG_PATH}/${GAME_NAME}_server.err &
--- a/ARK/game.params.ori
+++ b/ARK/game.params.ori
@ -1,7 +1,5 @@
-GAME_NAME=ARK
 GAME_STEAMID=376030
-GAME_PATH=/jeux/server_ark
+GAME_PATH=~/jeux/server_ark
 LOG_PATH=~/logs/${GAME_NAME}
-STEAMCMD=/home/steamcmd/steamcmd.sh
 GAME_BIN=${GAME_PATH}/ShooterGame/Binaries/Linux/ShooterGameServer
 GAME_PARAMS='TheIsland?listen?Port=7779?QueryPort=27015?SessionName=PATATE_Onimaro?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log'
--- a/ARK/game_globals
+++ b/ARK/game_globals
@ -0,0 +1,2 @@
+GAME_NAME="ARK"
+STEAMCMD=~/steamcmd/steamcmd.sh
--- a/DST/ARK_server_start.sh
+++ b/DST/ARK_server_start.sh
@ -0,0 +1,10 @@
+#!/bin/bash
+source $(dirname $0)/game_globals
+[ ! -r "$(dirname $0)/../../${GAME_NAME}.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/../../${GAME_NAME}.params" && exit 2
+source $(dirname $0)/../../${GAME_NAME}.params
+[ ! -d ${LOG_PATH} ] && mkdir -p ${LOG_PATH}
+[ ! -x ${GAME_BIN} ] && echo "Le binaire du jeu n'existe pas : ${GAME_BIN}"
+
+echo "Lancemement du serveur..."
+echo "${GAME_BIN} ${GAME_PARAMS}"
+nohup ${GAME_BIN} ${GAME_PARAMS} >> ${LOG_PATH}/${GAME_NAME}_server.log 2>> ${LOG_PATH}/${GAME_NAME}_server.err &
--- a/DST/DST_maj.sh
+++ b/DST/DST_maj.sh
@ -1,8 +1,16 @@
 #!/bin/bash
-
-[ ! -r "$(dirname $0)/DST.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/DST.params" && exit 2
-source $(dirname $0)/DST.params
-[ ! -d "${GAME_PATH}" ] && echo "Missing GAME_PATH ${GAME_PATH}" && exit 3
-[ -z ${GAME_STEAMID} ] && "Missing App SteamID"
+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 "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
+[ ! -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 ..."
 echo "${STEAMCMD} +login anonymous +force_install_dir ${GAME_PATH} +app_update ${GAME_STEAMID} +quit"
 ${STEAMCMD} +login anonymous +force_install_dir ${GAME_PATH} +app_update ${GAME_STEAMID} +quit
--- a/DST/DST_server_start.sh
+++ b/DST/DST_server_start.sh
@ -18,12 +18,12 @@ 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 /jeux/server_dst/bin
+cd ${GAME_PATH}/bin
 echo
 echo "  --- Don't Starve Together, exterieur "
-~steamcmd/scripts/DST/DST_shard_start.sh ${serveur} Master
+$(dirname $0)/DST_shard_start.sh ${serveur} Master
 sleep 15
 echo
 echo "  ----- Don't Starve Together, caves "
-~steamcmd/scripts/DST/DST_shard_start.sh ${serveur} Caves
+$(dirname $0)/DST_shard_start.sh ${serveur} Caves
 echo "Serveur demarre"
--- a/DST/DST_shard_start.sh
+++ b/DST/DST_shard_start.sh
@ -6,5 +6,5 @@ shard=$2
 [ -z ${serveur} ] && echo "XXX Missing parameter : server name XXX" && exit 1
 [ -z ${shard} ] && echo "XXX Missing parameter : shard [dehors|caves] XXX" && exit 1
 [ ${shard} != "Master" ] && [ ${shard} != "Caves" ] && echo "XXX Parameter error : shard [dehors|caves] XXX" && exit 1
-mkdir -p ~steamcmd/logs/DST
-nohup /jeux/server_dst/bin/dontstarve_dedicated_server_nullrenderer -console -cluster ${serveur}Cluster -shard ${shard} >> ~steamcmd/logs/DST/${serveur}_${shard}.out 2>>~steamcmd/logs/DST/${serveur}_${shard}.err &
+mkdir -p ${LOG_PATH}
+nohup ${GAME_BIN} ${GAME_PARAMS} >> ${LOG_PATH}/${serveur}_${shard}.out 2>>${LOG_PATH}/${serveur}_${shard}.err &
--- a/DST/game.params.ori
+++ b/DST/game.params.ori
@ -0,0 +1,5 @@
+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
--- a/DST/game_globals
+++ b/DST/game_globals
@ -0,0 +1,2 @@
+GAME_NAME='DST'
+STEAMCMD=~/steamcmd/steamcmd.sh
--- a/DST/old/DST_server_caro_start.sh
+++ b/DST/old/DST_server_caro_start.sh
@ -1,18 +0,0 @@
-#!/bin/bash
-
-echo
-echo
-echo "############################################"
-echo "#                                          #"
-echo "#        Demarrage des serveurs DST        #"
-echo "#                                          #"
-echo "############################################"
-echo
-cd /home/steamcmd/server_dst/bin
-echo
-echo "  --- Don't Starve Together, extérieur "
-/home/steamcmd/server_dst/bin/start_server_caro_dehors.sh
-sleep 15
-echo "  ----- Don't Starve Together, caves "
-/home/steamcmd/server_dst/bin/start_server_caro_caves.sh
-echo "Serveur demarré"
--- a/DST/old/DST_server_lapins_start.sh
+++ b/DST/old/DST_server_lapins_start.sh
@ -1,18 +0,0 @@
-#!/bin/bash
-
-echo
-echo
-echo "############################################"
-echo "#                                          #"
-echo "#        Demarrage des serveurs DST        #"
-echo "#                                          #"
-echo "############################################"
-echo
-cd /home/steamcmd/server_dst/bin
-echo
-echo "  --- Don't Starve Together, extérieur "
-/home/steamcmd/server_dst/bin/start_server_lapins_dehors.sh
-sleep 15
-echo "  ----- Don't Starve Together, caves "
-/home/steamcmd/server_dst/bin/start_server_lapins_caves.sh
-echo "Serveur demarré"
--- a/DST/old/DST_server_patate_start.sh
+++ b/DST/old/DST_server_patate_start.sh
@ -1,18 +0,0 @@
-#!/bin/bash
-
-echo
-echo
-echo "############################################"
-echo "#                                          #"
-echo "#        Demarrage des serveurs DST        #"
-echo "#                                          #"
-echo "############################################"
-echo
-cd /home/steamcmd/server_dst/bin
-echo
-echo "  --- Don't Starve Together, extérieur "
-/home/steamcmd/server_dst/bin/start_server_dehors.sh
-sleep 15
-echo "  ----- Don't Starve Together, caves "
-/home/steamcmd/server_dst/bin/start_server_caves.sh
-echo "Serveur demarré"
--- a/DST/old/DST_server_quatrieme_start.sh
+++ b/DST/old/DST_server_quatrieme_start.sh
@ -1,20 +0,0 @@
-#!/bin/bash
-
-echo
-echo
-echo "############################################"
-echo "#                                          #"
-echo "#        Demarrage des serveurs DST        #"
-echo "#                Quatrieme                 #"
-echo "############################################"
-echo
-cd /home/steamcmd/server_dst/bin
-echo
-echo
-echo
-echo "  --- Don't Starve Together, extérieur "
-/home/steamcmd/server_dst/bin/start_server_quatrieme_dehors.sh
-sleep 15
-echo "  ----- Don't Starve Together, caves "
-/home/steamcmd/server_dst/bin/start_server_quatrieme_caves.sh
-echo "Serveur demarré"