Merge pull request #3 from FezVrasta/1.5-dev

1.5 dev
This commit is contained in:
Budman17r 2015-11-04 15:05:12 -06:00
commit bbaf88a732
3 changed files with 7 additions and 7 deletions

View File

@ -1 +1 @@
1.4 1.5

View File

@ -7,7 +7,7 @@
# Contributors: Sispheor, Atriusftw, klightspeed, lexat, puseidr # Contributors: Sispheor, Atriusftw, klightspeed, lexat, puseidr
# Script version # Script version
arkstVersion="1.4" arkstVersion="1.5"
arkstCommit='' arkstCommit=''
doUpgradeTools() { doUpgradeTools() {
@ -98,7 +98,7 @@ runAsRoot(){
fi fi
if [ "$1" == "upgrade-tools" ]; then if [ "$1" == "upgrade-tools" ]; then
doUpgrade doUpgradeTools
elif [ "$1" == "uninstall-tools" ]; then elif [ "$1" == "uninstall-tools" ]; then
doUninstallTools doUninstallTools
else else
@ -917,11 +917,11 @@ isModUpdateNeeded(){
modsrcdir="$modsrcdir/${modbranch}NoEditor" modsrcdir="$modsrcdir/${modbranch}NoEditor"
fi 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 if [ \( ! -f "$moddestdir/${f%.z}" \) -o "$modsrcdir/$f" -nt "$moddestdir/${f%.z}" ]; then
return 0 return 0
fi fi
done done < <(find "$modsrcdir" -type f ! -name "*.z.uncompressed_size" -printf "%P\n")
fi fi
return 1 return 1

View File

@ -289,12 +289,12 @@ else
# Create a folder in /var/log to let Ark tools write its own log files # Create a folder in /var/log to let Ark tools write its own log files
mkdir -p "${INSTALL_ROOT}/var/log/arktools" 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 # Copy arkmanager.cfg inside linux configuation folder if it doesn't already exists
mkdir -p "${INSTALL_ROOT}/etc/arkmanager" mkdir -p "${INSTALL_ROOT}/etc/arkmanager"
cp arkmanager.cfg "${INSTALL_ROOT}/etc/arkmanager/arkmanager.cfg.NEW" 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\"|" \ sed -i -e "s|^steamcmd_user=\"steam\"|steamcmd_user=\"$steamcmd_user\"|" \
-e "s|\"/home/steam|\"/home/$steamcmd_user|" \ -e "s|\"/home/steam|\"/home/$steamcmd_user|" \
-e "s|^install_bindir=.*|install_bindir=\"${BINDIR}\"|" \ -e "s|^install_bindir=.*|install_bindir=\"${BINDIR}\"|" \