From a657c311e2a0cb09394cc1d16a8b0010fd37eb0c Mon Sep 17 00:00:00 2001 From: Marius Linge Date: Sun, 28 Jun 2015 17:58:54 +0200 Subject: [PATCH 1/5] Email is unsupported, shouldn't be in config. Fixes bug with vanishing items. --- tools/arkmanager.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/arkmanager.cfg b/tools/arkmanager.cfg index ec40e75..b888aac 100644 --- a/tools/arkmanager.cfg +++ b/tools/arkmanager.cfg @@ -25,6 +25,3 @@ logdir="/var/log/arktools" # Logs path # steamdb specific appid=376030 # Linux server App ID - -# admin information -servermail="" # Log email, leave blank if you dont want to receive mail From 4d30f2683d0e5a624b960f68a95c74febf0886be Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Mon, 29 Jun 2015 02:14:59 +1000 Subject: [PATCH 2/5] Change to the ark server root directory --- tools/arkmanager | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/arkmanager b/tools/arkmanager index d3cea38..04d4e50 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -164,6 +164,8 @@ doStart() { tput sc echo "The server is starting..." + cd "$arkserverroot" + arkserveropts=$serverMap # bring in ark_... options From db2af43babdaa509820f680a509d717b1171a611 Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Thu, 2 Jul 2015 18:19:59 +1000 Subject: [PATCH 3/5] Modify DAEMON variable in systemd init script --- tools/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/install.sh b/tools/install.sh index 55d249c..5e45a30 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -16,6 +16,7 @@ if [ ! -z "$1" ]; then chmod +x "${INSTALL_ROOT}${EXECPREFIX}/libexec/arkmanager/arkmanager.init" cp systemd/arkdeamon.service "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service" sed -i "s|=/usr/|=${EXECPREFIX}/|" "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service" + sed -i "s@^DAEMON=\"/usr@DAEMON=\"${EXECPREFIX}@" "${INSTALL_ROOT}${EXECPREFIX}/libexec/arkmanager/arkmanager.init" if [ -z "${INSTALL_ROOT}" ]; then systemctl daemon-reload systemctl enable arkmanager.service @@ -41,6 +42,7 @@ if [ ! -z "$1" ]; then chmod +x "${INSTALL_ROOT}${EXECPREFIX}/libexec/arkmanager/arkmanager.init" cp systemd/arkdeamon.service "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service" sed -i "s|=/usr/|=${EXECPREFIX}/|" "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service" + sed -i "s@^DAEMON=\"/usr@DAEMON=\"${EXECPREFIX}@" "${INSTALL_ROOT}${EXECPREFIX}/libexec/arkmanager/arkmanager.init" if [ -z "${INSTALL_ROOT}" ]; then systemctl daemon-reload systemctl enable arkmanager.service @@ -72,6 +74,7 @@ if [ ! -z "$1" ]; then chmod +x "${INSTALL_ROOT}${EXECPREFIX}/libexec/arkmanager/arkmanager.init" cp systemd/arkdeamon.service "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service" sed -i "s|=/usr/|=${EXECPREFIX}/|" "${INSTALL_ROOT}/etc/systemd/system/arkmanager.service" + sed -i "s@^DAEMON=\"/usr@DAEMON=\"${EXECPREFIX}@" "${INSTALL_ROOT}${EXECPREFIX}/libexec/arkmanager/arkmanager.init" if [ -z "${INSTALL_ROOT}" ]; then systemctl enable arkmanager.service echo "Ark server will now start on boot, if you want to remove this feature run the following line" From 9313d72a090b417408b2f7418d290edeae884084 Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Sat, 4 Jul 2015 21:13:13 +1000 Subject: [PATCH 4/5] Add notes on environment variables affecting install --- tools/install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/install.sh b/tools/install.sh index 5e45a30..fee74a2 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -103,6 +103,12 @@ if [ ! -z "$1" ]; then else echo "You must specify your system steam user who own steamcmd directory to install ARK Tools." echo "Usage: ./install.sh steam" + echo + echo "Environment variables affecting install:" + echo "EXECPREFIX: prefix in which to install arkmanager executable" + echo " [${EXECPREFIX}]" + echo "INSTALL_ROOT: staging directory in which to perform install" + echo " [${INSTALL_ROOT}]" exit 1 fi From f7ccbfe2f3c4f335393401cac6eb1dcdf9f14c4c Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Sun, 5 Jul 2015 22:01:01 +1000 Subject: [PATCH 5/5] Discover path of lsof --- tools/arkmanager | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/arkmanager b/tools/arkmanager index 04d4e50..0129bc3 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -25,6 +25,11 @@ if [ -f "${HOME}/.arkmanager.cfg" ]; then source "${HOME}/.arkmanager.cfg" fi +lsof=lsof +if [ -x /usr/sbin/lsof ]; then + lsof=/usr/sbin/lsof +fi + # Local variables info="" thejob="" @@ -142,7 +147,7 @@ function isTheServerRunning(){ # # function isTheServerUp(){ - lsof -i :"$ark_Port" > /dev/null + $lsof -i :"$ark_Port" > /dev/null result=$? # In this case, the result is: # 1 if the command fail. The port is not listenning