Fix some inconsistent spacing

This commit is contained in:
Ben Peddell 2020-09-29 19:50:10 +10:00
parent e52a97cc1c
commit 089e84cc81

View File

@ -1292,11 +1292,11 @@ doRun() {
# Enable auto-restart if the server is up # Enable auto-restart if the server is up
echo "$(timestamp): server is up" echo "$(timestamp): server is up"
notify "${notifyMsgServerUp:-Server is up}" notify "${notifyMsgServerUp:-Server is up}"
if [ "$restartserver" -eq 0 ]; then if [ "$restartserver" -eq 0 ]; then
touch "$arkserverroot/$arkautorestartfile" touch "$arkserverroot/$arkautorestartfile"
restartserver=1 restartserver=1
fi fi
serveronline=1 serveronline=1
fi fi
elif isTheServerUp; then elif isTheServerUp; then
(( serverdowntries++ )) (( serverdowntries++ ))
@ -1463,13 +1463,13 @@ doStart() {
if (( "${#instances[@]}" > 1 )); then if (( "${#instances[@]}" > 1 )); then
echo -n "Waiting up to ${delay} seconds before starting next instance " echo -n "Waiting up to ${delay} seconds before starting next instance "
while (( delay > 0 )); do while (( delay > 0 )); do
echo -n "." echo -n "."
if isTheServerOnline; then if isTheServerOnline; then
break break
fi fi
(( delay-- )) (( delay-- ))
done done
echo echo
fi fi
fi fi
fi fi
@ -1484,7 +1484,7 @@ doStartAll(){
if [ -f "${!cfg}" ]; then if [ -f "${!cfg}" ]; then
( (
# shellcheck source=instance.cfg.example # shellcheck source=instance.cfg.example
source "${!cfg}" source "${!cfg}"
doStart doStart
) )
fi fi
@ -1572,7 +1572,7 @@ doStopAll(){
if [ -f "${!cfg}" ]; then if [ -f "${!cfg}" ]; then
( (
# shellcheck source=instance.cfg.example # shellcheck source=instance.cfg.example
source "${!cfg}" source "${!cfg}"
doStop doStop
) )
fi fi
@ -3499,7 +3499,7 @@ doPrintConfig(){
if [ -r "$cfgfile" ]; then if [ -r "$cfgfile" ]; then
while read -r v; do while read -r v; do
# shellcheck source=arkmanager.cfg,instance.cfg.example # shellcheck source=arkmanager.cfg,instance.cfg.example
val="$(source "$cfgfile"; echo "${!v}")" val="$(source "$cfgfile"; echo "${!v}")"
if [[ "$val" = "${vals[$v]}" && -z "${vars[$v]}" ]]; then if [[ "$val" = "${vals[$v]}" && -z "${vars[$v]}" ]]; then
vars["$v"]="$cfgfile" vars["$v"]="$cfgfile"
echo "${cfgfile} => ${v}" echo "${cfgfile} => ${v}"
@ -3845,9 +3845,9 @@ main(){
--version) --version)
echo "Version: ${arkstVersion}" echo "Version: ${arkstVersion}"
echo "Channel: ${arkstChannel}" echo "Channel: ${arkstChannel}"
if [ -n "${arkstUsePkgManager}" ]; then if [ -n "${arkstUsePkgManager}" ]; then
echo "Installed by package manager: ${arkstUsePkgManager}" echo "Installed by package manager: ${arkstUsePkgManager}"
fi fi
if [ -n "${arkstCommit}" ]; then if [ -n "${arkstCommit}" ]; then
echo "Commit: ${arkstCommit:0:7}" echo "Commit: ${arkstCommit:0:7}"
fi fi
@ -3906,9 +3906,9 @@ main(){
case "$command" in case "$command" in
wait) wait)
doWait "${options[@]}" doWait "${options[@]}"
if [ "$#" == 0 ]; then if [ "$#" == 0 ]; then
break break
fi fi
continue continue
;; ;;
esac esac
@ -3995,9 +3995,9 @@ main(){
printconfig) printconfig)
doPrintConfig doPrintConfig
;; ;;
testconfig) testconfig)
doTestConfig doTestConfig
;; ;;
status) status)
printStatus printStatus
;; ;;