fix indentation

This commit is contained in:
Sispheor 2015-06-21 10:02:07 +02:00 committed by FezVrasta
parent a8e0f79c67
commit 6394b21eeb

View File

@ -108,11 +108,12 @@ case "$1" in
broadcast);; broadcast);;
status);; status);;
*) *)
echo "use arkmanager <start|stop|restart|install|update|broadcast|status>" echo "use arkmanager <start|stop|restart|install|update|broadcast|status|checkupdate>"
exit 0 exit 0
;; ;;
esac esac
<<<<<<< HEAD
# Global variables # Global variables
source ~/.arkmanager.cfg source ~/.arkmanager.cfg
@ -141,9 +142,18 @@ doStart() {
screen -dmS "$servicename" $thejob screen -dmS "$servicename" $thejob
echo "$timestamp: start" >> "$logdir/arkserver.log" echo "$timestamp: start" >> "$logdir/arkserver.log"
tail -n 1 "$logdir/arkserver.log" tail -n 1 "$logdir/arkserver.log"
=======
doStart() {
#
# start function
#
arkserveropts="TheIsland?QueryPort=$arkqueryport?Port=$arkserverport?ServerPassword=$arkserverpass?ServerAdminPassword=$arkserverapass?listen"
thejob="$arkserverroot/$arkserverexec $arkserveropts"
screen -dmS "$servicename" $thejob
echo "$timestamp: start" >> "$logdir/arkserver.log"
>>>>>>> fix indentation
} }
doStop() { doStop() {
# #
# stop the ARK server # stop the ARK server
@ -203,25 +213,21 @@ doUpdate() {
# #
cd $arkserverroot cd $arkserverroot
if isUpdateNeeded; then if isUpdateNeeded; then
if [ -f "$arkserverroot/arkupdate.timed" ]; then doStop
doStop cd $steamcmdroot
cd $steamcmdroot ./$steamcmdexec +login anonymous +force_install_dir "$arkserverroot" +app_update $appid +quit
./$steamcmdexec +login anonymous +force_install_dir "$arkserverroot" +app_update $appid validate +quit cd $logdir
cd $logdir echo "$bnumber" > "$arkserverroot/arkversion"
echo "$bnumber" > "$arkserverroot/arkversion" cd $steamcmdroot
cd $steamcmdroot doStart
doStart echo "$timestamp: update to $bnumber complete" >> "$logdir/update.log"
echo "$timestamp: update to $bnumber complete" >> "$logdir/update.log" if [ $servermail -ne "" ]; then
if [ $servermail != "" ]; then mail -a $logdir/update.log -s "Update-Log" $servermail < /dev/null
mail -a $logdir/update.log -s "Update-Log" $servermail < /dev/null fi
fi rm "$arkserverroot/arkupdate.timed"
rm "$arkserverroot/arkupdate.timed"
else
touch "$arkserverroot/arkupdate.timed"
info="There is a update for ark, server will restart in 60mins!!!!!"
doInfo $info
fi;
else else
echo "No update available"
echo "$timestamp: No update needed." >> "$logdir/update.log" echo "$timestamp: No update needed." >> "$logdir/update.log"
fi; fi;
>>>>>>> add check for update function >>>>>>> add check for update function
@ -275,8 +281,7 @@ case "$1" in
doInstall doInstall
;; ;;
update) update)
testupdate doUpdate
#doUpdate
;; ;;
checkupdate) checkupdate)
checkForUpdate checkForUpdate