Merge branch 'main' into two-servers

This commit is contained in:
Daniel Ceregatti 2024-06-22 13:12:48 -07:00
commit 118322f442
2 changed files with 9 additions and 5 deletions

View file

@ -32,6 +32,7 @@ then
else
git clone "${REPO}"
fi
rm -rf "${SERVER_FILES}/mpmissions/${MPDIR}"
cp -a "${DIR}/${MPDIR}" "${SERVER_FILES}/mpmissions"
rm -rf ${SERVER_FILES}/mpmissions/${MPDIR:?}
pushd "${DIR}" > /dev/null
find . -name "${MPDIR}" -exec cp -a {} "${SERVER_FILES}/mpmissions" \;
fi

View file

@ -2,7 +2,10 @@
set -eE
# There are two sets of mpmission files for Namalsk, one for the regular version and one for the hardcore version.
# This is why there is a wildcard in MPDIR.
MAP="Namalsk"
DIR="Namalsk-Server/Mission Files"
REPO="https://github.com/SumrakDZN/Namalsk-Server.git"
MPDIR="hardcore.namalsk"
DIR="Namalsk-Server"
REPO="https://github.com/SumrakDZN/${DIR}.git"
MPDIR="*.namalsk"