diff --git a/.version b/.version index c068b24..c239c60 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.4 +1.5 diff --git a/tools/arkmanager b/tools/arkmanager index 7080ebf..6ada483 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -7,7 +7,7 @@ # Contributors: Sispheor, Atriusftw, klightspeed, lexat, puseidr # Script version -arkstVersion="1.4" +arkstVersion="1.5" arkstCommit='' doUpgradeTools() { @@ -98,7 +98,7 @@ runAsRoot(){ fi if [ "$1" == "upgrade-tools" ]; then - doUpgrade + doUpgradeTools elif [ "$1" == "uninstall-tools" ]; then doUninstallTools else @@ -917,11 +917,11 @@ isModUpdateNeeded(){ modsrcdir="$modsrcdir/${modbranch}NoEditor" fi - find "$modsrcdir" -type f ! -name "*.z.uncompressed_size" -printf "%P\n" | while read f; do + while read f; do if [ \( ! -f "$moddestdir/${f%.z}" \) -o "$modsrcdir/$f" -nt "$moddestdir/${f%.z}" ]; then return 0 fi - done + done < <(find "$modsrcdir" -type f ! -name "*.z.uncompressed_size" -printf "%P\n") fi return 1 diff --git a/tools/install.sh b/tools/install.sh index 737a32b..f89b155 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -289,12 +289,12 @@ else # Create a folder in /var/log to let Ark tools write its own log files mkdir -p "${INSTALL_ROOT}/var/log/arktools" - chown "$1" "${INSTALL_ROOT}/var/log/arktools" + chown "$steamcmd_user" "${INSTALL_ROOT}/var/log/arktools" # Copy arkmanager.cfg inside linux configuation folder if it doesn't already exists 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" + chown "$steamcmd_user" "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW" 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}\"|" \