From 94eda243bf9869a8260f8eb4cb5b729097d6b52e Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Thu, 24 Sep 2015 07:28:29 +1000 Subject: [PATCH 1/2] Fix install.sh It was modifying arkmanager.cfg, when it should have been modifying arkmanager.cfg.NEW --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.sh b/tools/install.sh index d4e31d3..88bb1e2 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -276,7 +276,7 @@ else -e "s|^install_bindir=.*|install_bindir=\"${BINDIR}\"|" \ -e "s|^install_libexecdir=.*|install_libexecdir=\"${LIBEXECDIR}\"|" \ -e "s|^install_datadir=.*|install_datadir=\"${DATADIR}\"|" \ - "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg" + "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW" if [ -f "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg" ]; then echo "A previous version of ARK Server Tools was detected in your system, your old configuration was not overwritten. You may need to manually update it." From 72e0543b6ff40d3a2d5a4ab52e730e26ff81fa2b Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Thu, 24 Sep 2015 07:35:04 +1000 Subject: [PATCH 2/2] Use $steamcmd_user instead of $1 when altering new config --- tools/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index 88bb1e2..ab5843e 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -271,8 +271,8 @@ else mkdir -p "${INSTALL_ROOT}/etc/arkmanager" cp arkmanager.cfg "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW" chown "$1" "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW" - sed -i -e "s|^steamcmd_user=\"steam\"|steamcmd_user=\"$1\"|" \ - -e "s|\"/home/steam|\"/home/$1|" \ + sed -i -e "s|^steamcmd_user=\"steam\"|steamcmd_user=\"$steamcmd_user\"|" \ + -e "s|\"/home/steam|\"/home/$steamcmd_user|" \ -e "s|^install_bindir=.*|install_bindir=\"${BINDIR}\"|" \ -e "s|^install_libexecdir=.*|install_libexecdir=\"${LIBEXECDIR}\"|" \ -e "s|^install_datadir=.*|install_datadir=\"${DATADIR}\"|" \