From 6bd5ac5fc62ccc68bba5462c5e0c5332e64f8123 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 14 Apr 2017 13:44:54 +0100 Subject: [PATCH] further dir changes --- .../config-default/{ => config-lgsm}/arkserver/_default.cfg | 0 .../{ => config-lgsm}/arma3server/_default.cfg | 0 lgsm/config-default/{ => config-lgsm}/common-template.cfg | 0 .../{ => config-lgsm}/csgoserver/_default.cfg | 0 lgsm/config-default/{ => config-lgsm}/instance-template.cfg | 0 .../{ => config-lgsm}/sdtdserver/_default.cfg | 0 linuxgsm.sh | 6 +++--- 7 files changed, 3 insertions(+), 3 deletions(-) rename lgsm/config-default/{ => config-lgsm}/arkserver/_default.cfg (100%) rename lgsm/config-default/{ => config-lgsm}/arma3server/_default.cfg (100%) rename lgsm/config-default/{ => config-lgsm}/common-template.cfg (100%) rename lgsm/config-default/{ => config-lgsm}/csgoserver/_default.cfg (100%) rename lgsm/config-default/{ => config-lgsm}/instance-template.cfg (100%) rename lgsm/config-default/{ => config-lgsm}/sdtdserver/_default.cfg (100%) diff --git a/lgsm/config-default/arkserver/_default.cfg b/lgsm/config-default/config-lgsm/arkserver/_default.cfg similarity index 100% rename from lgsm/config-default/arkserver/_default.cfg rename to lgsm/config-default/config-lgsm/arkserver/_default.cfg diff --git a/lgsm/config-default/arma3server/_default.cfg b/lgsm/config-default/config-lgsm/arma3server/_default.cfg similarity index 100% rename from lgsm/config-default/arma3server/_default.cfg rename to lgsm/config-default/config-lgsm/arma3server/_default.cfg diff --git a/lgsm/config-default/common-template.cfg b/lgsm/config-default/config-lgsm/common-template.cfg similarity index 100% rename from lgsm/config-default/common-template.cfg rename to lgsm/config-default/config-lgsm/common-template.cfg diff --git a/lgsm/config-default/csgoserver/_default.cfg b/lgsm/config-default/config-lgsm/csgoserver/_default.cfg similarity index 100% rename from lgsm/config-default/csgoserver/_default.cfg rename to lgsm/config-default/config-lgsm/csgoserver/_default.cfg diff --git a/lgsm/config-default/instance-template.cfg b/lgsm/config-default/config-lgsm/instance-template.cfg similarity index 100% rename from lgsm/config-default/instance-template.cfg rename to lgsm/config-default/config-lgsm/instance-template.cfg diff --git a/lgsm/config-default/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg similarity index 100% rename from lgsm/config-default/sdtdserver/_default.cfg rename to lgsm/config-default/config-lgsm/sdtdserver/_default.cfg diff --git a/linuxgsm.sh b/linuxgsm.sh index 92f0dc6df..558a4c5a0 100644 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -315,7 +315,7 @@ else # Load the default config. If missing download it. If changed reload it. if [ ! -f "${configdirdefault}/config-lgsm/${servername}/_default.cfg" ];then mkdir -p "${configdirdefault}/config-lgsm/${servername}" - fn_boostrap_fetch_config "lgsm/config-default/${servername}" "_default.cfg" "${configdirdefault}/config-lgsm/${servername}" "_default.cfg" "noexecutecmd" "norun" "noforce" "nomd5" + fn_boostrap_fetch_config "lgsm/config-default/config-lgsm/${servername}" "_default.cfg" "${configdirdefault}/config-lgsm/${servername}" "_default.cfg" "noexecutecmd" "norun" "noforce" "nomd5" fi if [ ! -f "${configdirserver}/_default.cfg" ];then mkdir -p "${configdirserver}" @@ -330,14 +330,14 @@ else source "${configdirserver}/_default.cfg" # Load the common.cfg config. If missing download it if [ ! -f "${configdirserver}/common.cfg" ];then - fn_boostrap_fetch_config "lgsm/config-default" "common-template.cfg" "${configdirserver}" "common.cfg" "${executecmd}" "noexecutecmd" "norun" "noforce" "nomd5" + fn_boostrap_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${executecmd}" "noexecutecmd" "norun" "noforce" "nomd5" source "${configdirserver}/common.cfg" else source "${configdirserver}/common.cfg" fi # Load the instance.cfg config. If missing download it if [ ! -f "${configdirserver}/${servicename}.cfg" ];then - fn_boostrap_fetch_config "lgsm/config-default" "instance-template.cfg" "${configdirserver}" "${servicename}.cfg" "noexecutecmd" "norun" "noforce" "nomd5" + fn_boostrap_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${servicename}.cfg" "noexecutecmd" "norun" "noforce" "nomd5" source "${configdirserver}/${servicename}.cfg" else source "${configdirserver}/${servicename}.cfg"