Skip to content

Commit 6be6e95

Browse files
committed
Merge branch 'hotfix/v23.3.6'
2 parents fd8c83e + 5cb6c9e commit 6be6e95

File tree

147 files changed

+250
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+250
-207
lines changed

lgsm/config-default/config-lgsm/acserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
170170
backupdir="${lgsmdir}/backup"
171171

172172
## Logging Directories
173-
logdir="${rootdir}/log"
173+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
174174
gamelogdir="${systemdir}/logs"
175175
lgsmlogdir="${logdir}/script"
176176
consolelogdir="${logdir}/console"

lgsm/config-default/config-lgsm/ahl2server/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
178178
backupdir="${lgsmdir}/backup"
179179

180180
## Logging Directories
181-
logdir="${rootdir}/log"
181+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
182182
gamelogdir="${systemdir}/logs"
183183
lgsmlogdir="${logdir}/script"
184184
consolelogdir="${logdir}/console"

lgsm/config-default/config-lgsm/ahlserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
174174
backupdir="${lgsmdir}/backup"
175175

176176
## Logging Directories
177-
logdir="${rootdir}/log"
177+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
178178
gamelogdir="${systemdir}/logs"
179179
lgsmlogdir="${logdir}/script"
180180
consolelogdir="${logdir}/console"

lgsm/config-default/config-lgsm/arkserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
176176
backupdir="${lgsmdir}/backup"
177177

178178
## Logging Directories
179-
logdir="${rootdir}/log"
179+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
180180
gamelogdir="${systemdir}/Saved/Logs"
181181
lgsmlogdir="${logdir}/script"
182182
consolelogdir="${logdir}/console"

lgsm/config-default/config-lgsm/arma3server/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ networkcfgfullpath="${networkcfgdir}/${networkcfg}"
193193
backupdir="${lgsmdir}/backup"
194194

195195
## Logging Directories
196-
logdir="${rootdir}/log"
196+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
197197
lgsmlogdir="${logdir}/script"
198198
consolelogdir="${logdir}/console"
199199
lgsmlog="${lgsmlogdir}/${selfname}-script.log"

lgsm/config-default/config-lgsm/armarserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
174174
backupdir="${lgsmdir}/backup"
175175

176176
## Logging Directories
177-
logdir="${rootdir}/log"
177+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
178178
lgsmlogdir="${logdir}/script"
179179
consolelogdir="${logdir}/console"
180180
lgsmlog="${lgsmlogdir}/${selfname}-script.log"

lgsm/config-default/config-lgsm/atsserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
166166
backupdir="${lgsmdir}/backup"
167167

168168
## Logging Directories
169-
logdir="${rootdir}/log"
169+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
170170
lgsmlogdir="${logdir}/script"
171171
consolelogdir="${logdir}/console"
172172
lgsmlog="${lgsmlogdir}/${selfname}-script.log"

lgsm/config-default/config-lgsm/avserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
168168
backupdir="${lgsmdir}/backup"
169169

170170
## Logging Directories
171-
logdir="${rootdir}/log"
171+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
172172
gamelogdir="${systemdir}/ServerLogs"
173173
lgsmlogdir="${logdir}/script"
174174
consolelogdir="${logdir}/console"

lgsm/config-default/config-lgsm/bb2server/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
179179
backupdir="${lgsmdir}/backup"
180180

181181
## Logging Directories
182-
logdir="${rootdir}/log"
182+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
183183
gamelogdir="${systemdir}/logs"
184184
lgsmlogdir="${logdir}/script"
185185
consolelogdir="${logdir}/console"

lgsm/config-default/config-lgsm/bbserver/_default.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ servercfgfullpath="${servercfgdir}/${servercfg}"
174174
backupdir="${lgsmdir}/backup"
175175

176176
## Logging Directories
177-
logdir="${rootdir}/log"
177+
[ -n "${LGSM_LOGDIR}" ] && logdir="${LGSM_LOGDIR}" || logdir="${rootdir}/log"
178178
gamelogdir="${systemdir}/logs"
179179
lgsmlogdir="${logdir}/script"
180180
consolelogdir="${logdir}/console"

0 commit comments

Comments
 (0)