diff --git a/tools/arkmanager b/tools/arkmanager index c668302..aca1188 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="" @@ -185,7 +190,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 diff --git a/tools/arkmanager.cfg b/tools/arkmanager.cfg index 07325ea..23f96d7 100644 --- a/tools/arkmanager.cfg +++ b/tools/arkmanager.cfg @@ -28,6 +28,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 diff --git a/tools/install.sh b/tools/install.sh index 55d249c..fee74a2 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" @@ -100,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