From f6d402b6fe9b123d3bf62a67d58db274e84e4c7d Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Sat, 18 Jul 2015 10:28:22 +1000 Subject: [PATCH] Add support for custom modded maps --- tools/arkmanager | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/arkmanager b/tools/arkmanager index f382c21..7825bc3 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -276,7 +276,7 @@ function isTheServerUp(){ # run function # doRun() { - arkserveropts=$serverMap + arkserveropts="$serverMap" # bring in ark_... options for varname in "${!ark_@}"; do @@ -402,7 +402,7 @@ doSafeUpdate(){ cd "$arkserverroot" if isUpdateNeeded; then - while [ ! `find $arkserverroot/ShooterGame/Saved/SavedArks -mmin -1 -name $serverMap.ark` ]; do + while [ ! `find $arkserverroot/ShooterGame/Saved/SavedArks -mmin -1 -name ${serverMap##*/}.ark` ]; do echo "`timestamp`: Save file older than 1 minute. Delaying update." >> "$logdir/update.log" sleep 30s done @@ -424,17 +424,17 @@ doBackup(){ # ARK server uses Write-Unlink-Rename echo -ne "${NORMAL} Copying ARK world file " - cp -p "${arkserverroot}/ShooterGame/Saved/SavedArks/${serverMap}.ark" "${backupdir}/${serverMap}.ark" - if [ ! -f "${backupdir}/${serverMap}.ark" ]; then + cp -p "${arkserverroot}/ShooterGame/Saved/SavedArks/${serverMap##*/}.ark" "${backupdir}/${serverMap##*/}.ark" + if [ ! -f "${backupdir}/${serverMap##*/}.ark" ]; then sleep 2 - cp -p "${arkserverroot}/ShooterGame/Saved/SavedArks/${serverMap}.ark" "${backupdir}/${serverMap}.ark" + cp -p "${arkserverroot}/ShooterGame/Saved/SavedArks/${serverMap##*/}.ark" "${backupdir}/${serverMap##*/}.ark" fi # If both attempts fail, server may have # crashed between unlink and rename - if [ ! -f "${backupdir}/${serverMap}.ark" ]; then - cp -p "${arkserverroot}/ShooterGame/Saved/SavedArks/${serverMap}.tmp" "${backupdir}/${serverMap}.ark" + if [ ! -f "${backupdir}/${serverMap##*/}.ark" ]; then + cp -p "${arkserverroot}/ShooterGame/Saved/SavedArks/${serverMap}.tmp" "${backupdir##*/}/${serverMap##*/}.ark" fi - if [ -f "${backupdir}/${serverMap}.ark" ]; then + if [ -f "${backupdir}/${serverMap##*/}.ark" ]; then echo -e "${NORMAL}[ ${GREEN}OK${NORMAL} ]" else echo -e "${NORMAL}[ ${RED}FAILED${NORMAL} ]"