Merge branch 'master' into 1.6-dev.unstable

This commit is contained in:
Ben Peddell 2016-07-31 17:43:48 +10:00
commit 91916e0763

View File

@ -1496,6 +1496,11 @@ doDownloadMod(){
cd "$steamcmdroot"
retries=10
# Bypass the 111111111 modid used by Primitive+
if [ "$modid" = "111111111" ]; then
return 0
fi
while true; do
echo -n "Downloading mod $modid"
local output
@ -1533,10 +1538,6 @@ doDownloadMod(){
#
doDownloadAllMods(){
for modid in $(getModIds); do
# Bypass the 111111111 modid used by Primitive+
if [ "$modid" = "111111111" ]; then
continue
fi
doDownloadMod $modid || return 1
done
}
@ -1550,6 +1551,11 @@ isModUpdateNeeded(){
local moddestdir="$arkserverroot/ShooterGame/Content/Mods/$modid"
local modbranch="${mod_branch:-Windows}"
# Bypass the 111111111 modid used by Primitive+
if [ "$modid" = "111111111" ]; then
return 1
fi
if [ -n "${modsrcdirs[$modid]}" ]; then
modsrcdir="${modsrcdirs[$modid]}"
fi
@ -1637,6 +1643,11 @@ doExtractMod(){
local moddestdir="$arkserverroot/ShooterGame/Content/Mods/$modid"
local modbranch="${mod_branch:-Windows}"
# Bypass the 111111111 modid used by Primitive+
if [ "$modid" = "111111111" ]; then
return 0
fi
if [ -n "${modsrcdirs[$modid]}" ]; then
modsrcdir="${modsrcdirs[$modid]}"
fi