Merge pull request #269 from FezVrasta/master

Merge fixes from master into 1.5-dev
This commit is contained in:
Fez Vrasta 2015-11-04 14:42:37 +01:00
commit 92af76b8a7
2 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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}\"|" \