mirror of
https://github.com/eliasstepanik/ark-ac-server-tools.git
synced 2026-01-22 22:48:29 +00:00
Replace tabs with spaces
This commit is contained in:
parent
b0b10c804f
commit
2ea3a5fc93
@ -57,7 +57,7 @@ doUpgradeToolsFromCommit(){
|
|||||||
if [ ! -f "install.sh" ]; then echo "install.sh not found in $PWD"; exit 1; fi
|
if [ ! -f "install.sh" ]; then echo "install.sh not found in $PWD"; exit 1; fi
|
||||||
sed -i -e "s|^arkstCommit='.*'|arkstCommit='${commit}'|" \
|
sed -i -e "s|^arkstCommit='.*'|arkstCommit='${commit}'|" \
|
||||||
-e "s|^arkstTag='.*'|arkstTag='${tagname}'|" \
|
-e "s|^arkstTag='.*'|arkstTag='${tagname}'|" \
|
||||||
-e "s|^arkstRootUseEnv='.*'|arkstRootUseEnv='${arkstRootUseEnv}'|" \
|
-e "s|^arkstRootUseEnv='.*'|arkstRootUseEnv='${arkstRootUseEnv}'|" \
|
||||||
arkmanager
|
arkmanager
|
||||||
echo "Running install.sh"
|
echo "Running install.sh"
|
||||||
$sudo bash install.sh "$steamcmd_user" "${reinstall_args[@]}"
|
$sudo bash install.sh "$steamcmd_user" "${reinstall_args[@]}"
|
||||||
@ -1003,14 +1003,14 @@ doRun() {
|
|||||||
# Exit the server check loop
|
# Exit the server check loop
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "`timestamp`: Bad PID '$pid'; expected '$serverpid'"
|
echo "`timestamp`: Bad PID '$pid'; expected '$serverpid'"
|
||||||
if [ "$pid" != "" ]; then
|
if [ "$pid" != "" ]; then
|
||||||
# Another instance must be running - disable autorestart
|
# Another instance must be running - disable autorestart
|
||||||
restartserver=0
|
restartserver=0
|
||||||
fi
|
fi
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
sleep 5
|
sleep 5
|
||||||
done
|
done
|
||||||
@ -1558,7 +1558,7 @@ doUpdate() {
|
|||||||
local lockpid="$(<"${arkserverroot}/${arkupdatelockfile}")"
|
local lockpid="$(<"${arkserverroot}/${arkupdatelockfile}")"
|
||||||
if [ -n "$lockpid" ] && [ "$lockpid" != "${BASHPID}" ] && kill -0 "$lockpid" 2>/dev/null; then
|
if [ -n "$lockpid" ] && [ "$lockpid" != "${BASHPID}" ] && kill -0 "$lockpid" 2>/dev/null; then
|
||||||
logprint "Update already in progress (PID: $lockpid)"
|
logprint "Update already in progress (PID: $lockpid)"
|
||||||
rm -f "${arkserverroot}/${arkupdatelockfile}.${BASHPID}" 2>/dev/null
|
rm -f "${arkserverroot}/${arkupdatelockfile}.${BASHPID}" 2>/dev/null
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
rm -f "${arkserverroot}/${arkupdatelockfile}"
|
rm -f "${arkserverroot}/${arkupdatelockfile}"
|
||||||
@ -1609,14 +1609,14 @@ doUpdate() {
|
|||||||
|
|
||||||
if [ -z "$nodownload" ]; then
|
if [ -z "$nodownload" ]; then
|
||||||
echo -n "Downloading ARK update"
|
echo -n "Downloading ARK update"
|
||||||
logprint "Downloading ARK update" >/dev/null
|
logprint "Downloading ARK update" >/dev/null
|
||||||
doDownloadSteamCMD
|
doDownloadSteamCMD
|
||||||
cd "$steamcmdroot"
|
cd "$steamcmdroot"
|
||||||
if runSteamCMDAppUpdate "$arkStagingDir" $validate; then
|
if runSteamCMDAppUpdate "$arkStagingDir" $validate; then
|
||||||
rm -rf "${arkStagingDir}/steamapps/downloading/${appid}"
|
rm -rf "${arkStagingDir}/steamapps/downloading/${appid}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d "${arkStagingDir}/steamapps/downloading/${appid}" ]; then
|
if [ -d "${arkStagingDir}/steamapps/downloading/${appid}" ]; then
|
||||||
logprint "Update download interrupted"
|
logprint "Update download interrupted"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -1720,10 +1720,10 @@ doUpdate() {
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
echo -n "Performing ARK update"
|
echo -n "Performing ARK update"
|
||||||
logprint "Performing ARK update" >/dev/null
|
logprint "Performing ARK update" >/dev/null
|
||||||
doDownloadSteamCMD
|
doDownloadSteamCMD
|
||||||
cd "$steamcmdroot"
|
cd "$steamcmdroot"
|
||||||
runSteamCMDAppUpdate "$arkserverroot" $validate
|
runSteamCMDAppUpdate "$arkserverroot" $validate
|
||||||
fi
|
fi
|
||||||
# the current version should be the last version. We set our version
|
# the current version should be the last version. We set our version
|
||||||
instver="$(getCurrentVersion)"
|
instver="$(getCurrentVersion)"
|
||||||
@ -2430,9 +2430,9 @@ doBackup(){
|
|||||||
sort -n -r |
|
sort -n -r |
|
||||||
cut -f2-3 |
|
cut -f2-3 |
|
||||||
(sz=0; while read fsz f; do
|
(sz=0; while read fsz f; do
|
||||||
if (( sz / 1048576 > arkMaxBackupSizeMB )); then
|
if (( sz / 1048576 > arkMaxBackupSizeMB )); then
|
||||||
rm "$f"
|
rm "$f"
|
||||||
fi
|
fi
|
||||||
(( sz += fsz ))
|
(( sz += fsz ))
|
||||||
done)
|
done)
|
||||||
fi
|
fi
|
||||||
@ -2624,7 +2624,7 @@ doPrintConfig(){
|
|||||||
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}"
|
||||||
fi
|
fi
|
||||||
done < <(sed -n 's/^[[:space:]]*\([A-Za-z_][A-Za-z0-9_]*\)=.*/\1/p' <"$cfgfile")
|
done < <(sed -n 's/^[[:space:]]*\([A-Za-z_][A-Za-z0-9_]*\)=.*/\1/p' <"$cfgfile")
|
||||||
done
|
done
|
||||||
@ -2882,11 +2882,11 @@ main(){
|
|||||||
case "$command" in
|
case "$command" in
|
||||||
install-cronjob)
|
install-cronjob)
|
||||||
doInstallCronJob "${args[@]}" "${options[@]}" "$@"
|
doInstallCronJob "${args[@]}" "${options[@]}" "$@"
|
||||||
exit
|
exit
|
||||||
;;
|
;;
|
||||||
remove-cronjob)
|
remove-cronjob)
|
||||||
doRemoveCronJob "${args[@]}"
|
doRemoveCronJob "${args[@]}"
|
||||||
exit
|
exit
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -2940,9 +2940,9 @@ main(){
|
|||||||
installmods)
|
installmods)
|
||||||
doInstallAllMods
|
doInstallAllMods
|
||||||
;;
|
;;
|
||||||
uninstallmods)
|
uninstallmods)
|
||||||
doUninstallAllMods
|
doUninstallAllMods
|
||||||
;;
|
;;
|
||||||
uninstallmod)
|
uninstallmod)
|
||||||
doUninstallMod "${args[@]}"
|
doUninstallMod "${args[@]}"
|
||||||
;;
|
;;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user