gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feat(core_dl): add more hashing methods (#3280)

pull/3289/head
Christian 4 years ago
committed by GitHub
parent
1aa07bbf60
commit
ce1fe2955a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 110 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lgsm/functions/command_dev_query_raw.sh
  2. 2
      lgsm/functions/command_install_resources_mta.sh
  3. 2
      lgsm/functions/command_monitor.sh
  4. 4
      lgsm/functions/command_update_linuxgsm.sh
  5. 75
      lgsm/functions/core_dl.sh
  6. 12
      lgsm/functions/core_functions.sh
  7. 2
      lgsm/functions/core_steamcmd.sh
  8. 4
      lgsm/functions/info_stats.sh
  9. 2
      lgsm/functions/install_config.sh
  10. 2
      lgsm/functions/install_modules.sh
  11. 2
      lgsm/functions/update_factorio.sh
  12. 2
      lgsm/functions/update_jediknight2.sh
  13. 2
      lgsm/functions/update_minecraft.sh
  14. 2
      lgsm/functions/update_mta.sh
  15. 2
      lgsm/functions/update_mumble.sh
  16. 2
      lgsm/functions/update_ts3.sh
  17. 16
      linuxgsm.sh
  18. 16
      tests/tests_fctrserver.sh
  19. 16
      tests/tests_jc2server.sh
  20. 16
      tests/tests_mcserver.sh
  21. 16
      tests/tests_ts3server.sh

2
lgsm/functions/command_dev_query_raw.sh
View File

@ -52,7 +52,7 @@ for queryip in "${queryips[@]}"; do
echo -e "./query_gsquery.py -a \"${queryip}\" -p \"${queryport}\" -e \"${querytype}\"" echo -e "./query_gsquery.py -a \"${queryip}\" -p \"${queryport}\" -e \"${querytype}\""
echo -e "" echo -e ""
if [ ! -f "${functionsdir}/query_gsquery.py" ]; then if [ ! -f "${functionsdir}/query_gsquery.py" ]; then
fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nomd5" fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nohash"
fi fi
"${functionsdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}" "${functionsdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}"
done done

2
lgsm/functions/command_install_resources_mta.sh
View File

@ -14,7 +14,7 @@ fn_install_resources(){
echo -e "" echo -e ""
echo -e "Installing Default Resources" echo -e "Installing Default Resources"
echo -e "=================================" echo -e "================================="
fn_fetch_file "http://mirror.mtasa.com/mtasa/resources/mtasa-resources-latest.zip" "" "" "" "${tmpdir}" "mtasa-resources-latest.zip" "nochmodx" "norun" "noforce" "nomd5" fn_fetch_file "http://mirror.mtasa.com/mtasa/resources/mtasa-resources-latest.zip" "" "" "" "${tmpdir}" "mtasa-resources-latest.zip" "nochmodx" "norun" "noforce" "nohash"
fn_dl_extract "${tmpdir}" "mtasa-resources-latest.zip" "${resourcesdir}" fn_dl_extract "${tmpdir}" "mtasa-resources-latest.zip" "${resourcesdir}"
echo -e "Default Resources Installed." echo -e "Default Resources Installed."
} }

2
lgsm/functions/command_monitor.sh
View File

@ -87,7 +87,7 @@ fn_monitor_check_queryport(){
fn_query_gsquery(){ fn_query_gsquery(){
if [ ! -f "${functionsdir}/query_gsquery.py" ]; then if [ ! -f "${functionsdir}/query_gsquery.py" ]; then
fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nomd5" fn_fetch_file_github "lgsm/functions" "query_gsquery.py" "${functionsdir}" "chmodx" "norun" "noforce" "nohash"
fi fi
"${functionsdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}" > /dev/null 2>&1 "${functionsdir}"/query_gsquery.py -a "${queryip}" -p "${queryport}" -e "${querytype}" > /dev/null 2>&1
querystatus="$?" querystatus="$?"

4
lgsm/functions/command_update_linuxgsm.sh
View File

@ -58,7 +58,7 @@ if [ "${tmp_script_diff}" != "" ]; then
fn_print_update_eol_nl fn_print_update_eol_nl
fn_script_log_update "Checking ${remotereponame} linuxgsm.sh" fn_script_log_update "Checking ${remotereponame} linuxgsm.sh"
rm -f "${tmpdir:?}/linuxgsm.sh" rm -f "${tmpdir:?}/linuxgsm.sh"
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "nochmodx" "norun" "noforcedl" "nohash"
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "Checking ${remotereponame} linuxgsm.sh" fn_script_log_pass "Checking ${remotereponame} linuxgsm.sh"
@ -138,7 +138,7 @@ if [ "${config_file_diff}" != "" ]; then
fn_print_update_eol_nl fn_print_update_eol_nl
fn_script_log_update "Checking ${remotereponame} config _default.cfg" fn_script_log_update "Checking ${remotereponame} config _default.cfg"
rm -f "${configdirdefault:?}/config-lgsm/${gameservername:?}/_default.cfg" rm -f "${configdirdefault:?}/config-lgsm/${gameservername:?}/_default.cfg"
fn_fetch_file_github "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "nochmodx" "norun" "noforce" "nomd5" fn_fetch_file_github "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "nochmodx" "norun" "noforce" "nohash"
alert="config" alert="config"
alert.sh alert.sh
else else

75
lgsm/functions/core_dl.sh
View File

@ -11,10 +11,10 @@
# chmodx: Optional, set to "chmodx" to make file executable using chmod +x # chmodx: Optional, set to "chmodx" to make file executable using chmod +x
# run: Optional, set run to execute the file after download # run: Optional, set run to execute the file after download
# forcedl: Optional, force re-download of file even if exists # forcedl: Optional, force re-download of file even if exists
# md5: Optional, set an md5 sum and will compare it against the file. # hash: Optional, set an hash sum and will compare it against the file.
# #
# Downloads can be defined in code like so: # Downloads can be defined in code like so:
# fn_fetch_file "${remote_fileurl}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" # fn_fetch_file "${remote_fileurl}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${hash}"
# fn_fetch_file "http://example.com/file.tar.bz2" "/some/dir" "file.tar.bz2" "chmodx" "run" "forcedl" "10cd7353aa9d758a075c600a6dd193fd" # fn_fetch_file "http://example.com/file.tar.bz2" "/some/dir" "file.tar.bz2" "chmodx" "run" "forcedl" "10cd7353aa9d758a075c600a6dd193fd"
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
@ -150,25 +150,46 @@ fn_clear_tmp(){
fi fi
} }
fn_dl_md5(){ fn_dl_hash(){
# Runs MD5 Check if available. # Runs Hash Check if available.
if [ "${md5}" != "0" ]&&[ "${md5}" != "nomd5" ]; then if [ "${hash}" != "0" ]&&[ "${hash}" != "nohash" ]&&[ "${hash}" != "nomd5" ]; then
echo -en "verifying ${local_filename} with MD5..." # MD5
if [ "${#hash}" == "32" ]; then
hashbin="md5sum"
hashtype="MD5"
# SHA1
elif [ "${#hash}" == "40" ]; then
hashbin="sha1sum"
hashtype="SHA1"
# SHA256
elif [ "${#hash}" == "64" ]; then
hashbin="sha256sum"
hashtype="SHA256"
# SHA512
elif [ "${#hash}" == "128" ]; then
hashbin="sha512sum"
hashtype="SHA512"
else
fn_script_log_error "hash lengh not known for hash type"
fn_print_error_nl "hash lengh not known for hash type"
core_exit.sh
fi
echo -en "verifying ${local_filename} with ${hashtype}..."
fn_sleep_time fn_sleep_time
md5sumcmd=$(md5sum "${local_filedir}/${local_filename}"|awk '{print $1;}') hashsumcmd=$(${hashbin} "${local_filedir}/${local_filename}" | awk '{print $1}')
if [ "${md5sumcmd}" != "${md5}" ]; then if [ "${hashsumcmd}" != "${hash}" ]; then
fn_print_fail_eol_nl fn_print_fail_eol_nl
echo -e "${local_filename} returned MD5 checksum: ${md5sumcmd}" echo -e "${local_filename} returned ${hashtype} checksum: ${hashsumcmd}"
echo -e "expected MD5 checksum: ${md5}" echo -e "expected ${hashtype} checksum: ${hash}"
fn_script_log_fatal "Verifying ${local_filename} with MD5" fn_script_log_fatal "Verifying ${local_filename} with ${hashtype}"
fn_script_log_info "${local_filename} returned MD5 checksum: ${md5sumcmd}" fn_script_log_info "${local_filename} returned ${hashtype} checksum: ${hashsumcmd}"
fn_script_log_info "Expected MD5 checksum: ${md5}" fn_script_log_info "Expected ${hashtype} checksum: ${hash}"
core_exit.sh core_exit.sh
else else
fn_print_ok_eol_nl fn_print_ok_eol_nl
fn_script_log_pass "Verifying ${local_filename} with MD5" fn_script_log_pass "Verifying ${local_filename} with ${hashtype}"
fn_script_log_info "${local_filename} returned MD5 checksum: ${md5sumcmd}" fn_script_log_info "${local_filename} returned ${hashtype} checksum: ${hashsumcmd}"
fn_script_log_info "Expected MD5 checksum: ${md5}" fn_script_log_info "Expected ${hashtype} checksum: ${hash}"
fi fi
fi fi
} }
@ -235,7 +256,7 @@ fn_fetch_file(){
chmodx="${7:-0}" chmodx="${7:-0}"
run="${8:-0}" run="${8:-0}"
forcedl="${9:-0}" forcedl="${9:-0}"
md5="${10:-0}" hash="${10:-0}"
# Download file if missing or download forced. # Download file if missing or download forced.
if [ ! -f "${local_filedir}/${local_filename}" ]||[ "${forcedl}" == "forcedl" ]; then if [ ! -f "${local_filedir}/${local_filename}" ]||[ "${forcedl}" == "forcedl" ]; then
@ -322,7 +343,7 @@ fn_fetch_file(){
fi fi
if [ -f "${local_filedir}/${local_filename}" ]; then if [ -f "${local_filedir}/${local_filename}" ]; then
fn_dl_md5 fn_dl_hash
# Execute file if run is set. # Execute file if run is set.
if [ "${run}" == "run" ]; then if [ "${run}" == "run" ]; then
# shellcheck source=/dev/null # shellcheck source=/dev/null
@ -344,7 +365,7 @@ fn_fetch_file(){
# chmodx: Optional, set to "chmodx" to make file executable using chmod +x # chmodx: Optional, set to "chmodx" to make file executable using chmod +x
# run: Optional, set run to execute the file after download # run: Optional, set run to execute the file after download
# forcedl: Optional, force re-download of file even if exists # forcedl: Optional, force re-download of file even if exists
# md5: Optional, set an md5 sum and will compare it against the file. # hash: Optional, set an hash sum and will compare it against the file.
# Fetches files from the Git repo. # Fetches files from the Git repo.
fn_fetch_file_github(){ fn_fetch_file_github(){
@ -369,9 +390,9 @@ fn_fetch_file_github(){
chmodx="${4:-0}" chmodx="${4:-0}"
run="${5:-0}" run="${5:-0}"
forcedl="${6:-0}" forcedl="${6:-0}"
md5="${7:-0}" hash="${7:-0}"
# Passes vars to the file download function. # Passes vars to the file download function.
fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${hash}"
} }
# Fetches config files from the Git repo. # Fetches config files from the Git repo.
@ -393,9 +414,9 @@ fn_fetch_config(){
chmodx="nochmodx" chmodx="nochmodx"
run="norun" run="norun"
forcedl="noforce" forcedl="noforce"
md5="nomd5" hash="nohash"
# Passes vars to the file download function. # Passes vars to the file download function.
fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${hash}"
} }
# Fetches modules from the Git repo during first download. # Fetches modules from the Git repo during first download.
@ -417,9 +438,9 @@ fn_fetch_function(){
chmodx="chmodx" chmodx="chmodx"
run="run" run="run"
forcedl="noforce" forcedl="noforce"
md5="nomd5" hash="nohash"
# Passes vars to the file download function. # Passes vars to the file download function.
fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${hash}"
} }
# Fetches modules from the Git repo during update-lgsm. # Fetches modules from the Git repo during update-lgsm.
@ -441,9 +462,9 @@ fn_update_function(){
chmodx="chmodx" chmodx="chmodx"
run="norun" run="norun"
forcedl="noforce" forcedl="noforce"
md5="nomd5" hash="nohash"
# Passes vars to the file download function. # Passes vars to the file download function.
fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}" fn_fetch_file "${remote_fileurl}" "${remote_fileurl_backup}" "${remote_fileurl_name}" "${remote_fileurl_backup_name}" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${hash}"
} }

12
lgsm/functions/core_functions.sh
View File

@ -15,27 +15,27 @@ modulesversion="v21.1.3"
core_dl.sh(){ core_dl.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then
fn_fetch_core_dl "lgsm/functions" "core_dl.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_fetch_core_dl "lgsm/functions" "core_dl.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
else else
fn_bootstrap_fetch_file_github "lgsm/functions" "core_dl.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/functions" "core_dl.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
fi fi
} }
core_messages.sh(){ core_messages.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then
fn_fetch_core_dl "lgsm/functions" "core_messages.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_fetch_core_dl "lgsm/functions" "core_messages.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
else else
fn_bootstrap_fetch_file_github "lgsm/functions" "core_messages.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/functions" "core_messages.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
fi fi
} }
core_legacy.sh(){ core_legacy.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then if [ "$(type fn_fetch_core_dl 2>/dev/null)" ]; then
fn_fetch_core_dl "lgsm/functions" "core_legacy.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_fetch_core_dl "lgsm/functions" "core_legacy.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
else else
fn_bootstrap_fetch_file_github "lgsm/functions" "core_legacy.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/functions" "core_legacy.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
fi fi
} }

2
lgsm/functions/core_steamcmd.sh
View File

@ -14,7 +14,7 @@ fn_install_steamcmd(){
if [ ! -d "${steamcmddir}" ]; then if [ ! -d "${steamcmddir}" ]; then
mkdir -p "${steamcmddir}" mkdir -p "${steamcmddir}"
fi fi
fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "" "" "" "${tmpdir}" "steamcmd_linux.tar.gz" "" "norun" "noforce" "nomd5" fn_fetch_file "http://media.steampowered.com/client/steamcmd_linux.tar.gz" "" "" "" "${tmpdir}" "steamcmd_linux.tar.gz" "" "norun" "noforce" "nohash"
fn_dl_extract "${tmpdir}" "steamcmd_linux.tar.gz" "${steamcmddir}" fn_dl_extract "${tmpdir}" "steamcmd_linux.tar.gz" "${steamcmddir}"
chmod +x "${steamcmddir}/steamcmd.sh" chmod +x "${steamcmddir}/steamcmd.sh"
} }

4
lgsm/functions/info_stats.sh
View File

@ -23,10 +23,10 @@ fi
if [ ! -f "${datadir}/uuid-${selfname}.txt" ]||[ ! -f "${datadir}/uuid-install.txt" ]; then if [ ! -f "${datadir}/uuid-${selfname}.txt" ]||[ ! -f "${datadir}/uuid-install.txt" ]; then
# download dictionary words # download dictionary words
if [ ! -f "${datadir}/name-left.csv" ]; then if [ ! -f "${datadir}/name-left.csv" ]; then
fn_fetch_file_github "lgsm/data" "name-left.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" fn_fetch_file_github "lgsm/data" "name-left.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash"
fi fi
if [ ! -f "${datadir}/name-right.csv" ]; then if [ ! -f "${datadir}/name-right.csv" ]; then
fn_fetch_file_github "lgsm/data" "name-right.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" fn_fetch_file_github "lgsm/data" "name-right.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash"
fi fi
# generate instance uuid # generate instance uuid

2
lgsm/functions/install_config.sh
View File

@ -26,7 +26,7 @@ fn_fetch_default_config(){
mkdir -p "${lgsmdir}/config-default/config-game" mkdir -p "${lgsmdir}/config-default/config-game"
githuburl="https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/master" githuburl="https://raw.githubusercontent.com/GameServerManagers/Game-Server-Configs/master"
for config in "${array_configs[@]}"; do for config in "${array_configs[@]}"; do
fn_fetch_file "${githuburl}/${gamedirname}/${config}" "${remote_fileurl_backup}" "GitHub" "Bitbucket" "${lgsmdir}/config-default/config-game" "${config}" "nochmodx" "norun" "forcedl" "nomd5" fn_fetch_file "${githuburl}/${gamedirname}/${config}" "${remote_fileurl_backup}" "GitHub" "Bitbucket" "${lgsmdir}/config-default/config-game" "${config}" "nochmodx" "norun" "forcedl" "nohash"
done done
} }

2
lgsm/functions/install_modules.sh
View File

@ -11,7 +11,7 @@ echo -e ""
echo -e "${lightyellow}Downloading LinuxGSM Modules${default}" echo -e "${lightyellow}Downloading LinuxGSM Modules${default}"
echo -e "=================================" echo -e "================================="
fn_fetch_file "https://github.com/GameServerManagers/LinuxGSM/archive/master.tar.gz" "${tmpdir}" "master.tar.gz" "nochmodx" "norun" "noforce" "nomd5" fn_fetch_file "https://github.com/GameServerManagers/LinuxGSM/archive/master.tar.gz" "${tmpdir}" "master.tar.gz" "nochmodx" "norun" "noforce" "nohash"
fn_dl_extract "${tmpdir}" "master.tar.gz" "${tmpdir}" fn_dl_extract "${tmpdir}" "master.tar.gz" "${tmpdir}"
cp "${tmpdir}/LinuxGSM-master/lgsm/functions"/*.sh "${functionsdir}" cp "${tmpdir}/LinuxGSM-master/lgsm/functions"/*.sh "${functionsdir}"
cp "${tmpdir}/LinuxGSM-master/lgsm/functions"/*.py "${functionsdir}" cp "${tmpdir}/LinuxGSM-master/lgsm/functions"/*.py "${functionsdir}"

2
lgsm/functions/update_factorio.sh
View File

@ -8,7 +8,7 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_update_factorio_dl(){ fn_update_factorio_dl(){
fn_fetch_file "https://factorio.com/get-download/${downloadbranch}/headless/${factorioarch}" "" "" "" "${tmpdir}" "factorio_headless_${factorioarch}-${remotebuild}.tar.xz" "" "norun" "noforce" "nomd5" fn_fetch_file "https://factorio.com/get-download/${downloadbranch}/headless/${factorioarch}" "" "" "" "${tmpdir}" "factorio_headless_${factorioarch}-${remotebuild}.tar.xz" "" "norun" "noforce" "nohash"
fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${remotebuild}.tar.xz" "${tmpdir}" fn_dl_extract "${tmpdir}" "factorio_headless_${factorioarch}-${remotebuild}.tar.xz" "${tmpdir}"
echo -e "copying to ${serverfiles}...\c" echo -e "copying to ${serverfiles}...\c"
cp -R "${tmpdir}/factorio/"* "${serverfiles}" cp -R "${tmpdir}/factorio/"* "${serverfiles}"

2
lgsm/functions/update_jediknight2.sh
View File

@ -8,7 +8,7 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_update_jk2_dl(){ fn_update_jk2_dl(){
fn_fetch_file "https://github.com/mvdevs/jk2mv/releases/download/${remotebuild}/jk2mv-v${remotebuild}-dedicated.zip" "" "" "" "${tmpdir}" "jk2mv-${remotebuild}-dedicated.zip" "" "norun" "noforce" "nomd5" fn_fetch_file "https://github.com/mvdevs/jk2mv/releases/download/${remotebuild}/jk2mv-v${remotebuild}-dedicated.zip" "" "" "" "${tmpdir}" "jk2mv-${remotebuild}-dedicated.zip" "" "norun" "noforce" "nohash"
fn_dl_extract "${tmpdir}" "jk2mv-${remotebuild}-dedicated.zip" "${tmpdir}/jk2mv-v${remotebuild}-dedicated" fn_dl_extract "${tmpdir}" "jk2mv-${remotebuild}-dedicated.zip" "${tmpdir}/jk2mv-v${remotebuild}-dedicated"
echo -e "copying to ${serverfiles}...\c" echo -e "copying to ${serverfiles}...\c"
cp -R "${tmpdir}/jk2mv-v${remotebuild}-dedicated/linux-amd64/jk2mvded"* "${serverfiles}/GameData" cp -R "${tmpdir}/jk2mv-v${remotebuild}-dedicated/linux-amd64/jk2mvded"* "${serverfiles}/GameData"

2
lgsm/functions/update_minecraft.sh
View File

@ -13,7 +13,7 @@ fn_update_minecraft_dl(){
# Generate link to server.jar # Generate link to server.jar
remotebuildurl=$(curl -s "${remotebuildlink}" | jq -r '.downloads.server.url') remotebuildurl=$(curl -s "${remotebuildlink}" | jq -r '.downloads.server.url')
fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "minecraft_server.${remotebuild}.jar" "" "norun" "noforce" "nomd5" fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "minecraft_server.${remotebuild}.jar" "" "norun" "noforce" "nohash"
echo -e "copying to ${serverfiles}...\c" echo -e "copying to ${serverfiles}...\c"
cp "${tmpdir}/minecraft_server.${remotebuild}.jar" "${serverfiles}/minecraft_server.jar" cp "${tmpdir}/minecraft_server.${remotebuild}.jar" "${serverfiles}/minecraft_server.jar"
local exitcode=$? local exitcode=$?

2
lgsm/functions/update_mta.sh
View File

@ -8,7 +8,7 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_update_mta_dl(){ fn_update_mta_dl(){
fn_fetch_file "http://linux.mtasa.com/dl/multitheftauto_linux_x64.tar.gz" "" "" "" "${tmpdir}" "multitheftauto_linux_x64.tar.gz" "" "norun" "noforce" "nomd5" fn_fetch_file "http://linux.mtasa.com/dl/multitheftauto_linux_x64.tar.gz" "" "" "" "${tmpdir}" "multitheftauto_linux_x64.tar.gz" "" "norun" "noforce" "nohash"
mkdir "${tmpdir}/multitheftauto_linux_x64" mkdir "${tmpdir}/multitheftauto_linux_x64"
fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64.tar.gz" "${tmpdir}/multitheftauto_linux_x64" fn_dl_extract "${tmpdir}" "multitheftauto_linux_x64.tar.gz" "${tmpdir}/multitheftauto_linux_x64"
echo -e "copying to ${serverfiles}...\c" echo -e "copying to ${serverfiles}...\c"

2
lgsm/functions/update_mumble.sh
View File

@ -8,7 +8,7 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_update_mumble_dl(){ fn_update_mumble_dl(){
fn_fetch_file "https://github.com/mumble-voip/mumble/releases/download/${remotebuild}/murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "" "" "" "${tmpdir}" "murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "" "norun" "noforce" "nomd5" fn_fetch_file "https://github.com/mumble-voip/mumble/releases/download/${remotebuild}/murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "" "" "" "${tmpdir}" "murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "" "norun" "noforce" "nohash"
fn_dl_extract "${tmpdir}" "murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "${tmpdir}" fn_dl_extract "${tmpdir}" "murmur-static_${mumblearch}-${remotebuild}.tar.bz2" "${tmpdir}"
echo -e "copying to ${serverfiles}...\c" echo -e "copying to ${serverfiles}...\c"
cp -R "${tmpdir}/murmur-static_${mumblearch}-${remotebuild}/"* "${serverfiles}" cp -R "${tmpdir}/murmur-static_${mumblearch}-${remotebuild}/"* "${serverfiles}"

2
lgsm/functions/update_ts3.sh
View File

@ -13,7 +13,7 @@ fn_update_ts3_dl(){
elif [ "${ts3arch}" == "x86" ]; then elif [ "${ts3arch}" == "x86" ]; then
remotebuildurl=$(curl -s 'https://www.teamspeak.com/versions/server.json' | jq -r '.linux.x86.mirrors."teamspeak.com"') remotebuildurl=$(curl -s 'https://www.teamspeak.com/versions/server.json' | jq -r '.linux.x86.mirrors."teamspeak.com"')
fi fi
fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "teamspeak3-server_linux_${ts3arch}-${remotebuild}.tar.bz2" "" "norun" "noforce" "nomd5" fn_fetch_file "${remotebuildurl}" "" "" "" "${tmpdir}" "teamspeak3-server_linux_${ts3arch}-${remotebuild}.tar.bz2" "" "norun" "noforce" "nohash"
fn_dl_extract "${tmpdir}" "teamspeak3-server_linux_${ts3arch}-${remotebuild}.tar.bz2" "${tmpdir}" fn_dl_extract "${tmpdir}" "teamspeak3-server_linux_${ts3arch}-${remotebuild}.tar.bz2" "${tmpdir}"
echo -e "copying to ${serverfiles}...\c" echo -e "copying to ${serverfiles}...\c"
cp -R "${tmpdir}/teamspeak3-server_linux_${ts3arch}/"* "${serverfiles}" cp -R "${tmpdir}/teamspeak3-server_linux_${ts3arch}/"* "${serverfiles}"

16
linuxgsm.sh
View File

@ -53,7 +53,7 @@ githubbranch="master"
# Core function that is required first. # Core function that is required first.
core_functions.sh(){ core_functions.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
} }
# Bootstrap # Bootstrap
@ -330,7 +330,7 @@ fi
# LinuxGSM installer mode. # LinuxGSM installer mode.
if [ "${shortname}" == "core" ]; then if [ "${shortname}" == "core" ]; then
# Download the latest serverlist. This is the complete list of all supported servers. # Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash"
if [ ! -f "${serverlist}" ]; then if [ ! -f "${serverlist}" ]; then
echo -e "[ FAIL ] serverlist.csv could not be loaded." echo -e "[ FAIL ] serverlist.csv could not be loaded."
exit 1 exit 1
@ -375,7 +375,7 @@ else
# Load the default config. If missing download it. If changed reload it. # Load the default config. If missing download it. If changed reload it.
if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then
mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" mkdir -p "${configdirdefault}/config-lgsm/${gameservername}"
fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash"
fi fi
if [ ! -f "${configdirserver}/_default.cfg" ]; then if [ ! -f "${configdirserver}/_default.cfg" ]; then
mkdir -p "${configdirserver}" mkdir -p "${configdirserver}"
@ -407,7 +407,7 @@ else
source "${configdirserver}/_default.cfg" source "${configdirserver}/_default.cfg"
# Load the common.cfg config. If missing download it. # Load the common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/common.cfg" ]; then if [ ! -f "${configdirserver}/common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/common.cfg" source "${configdirserver}/common.cfg"
else else
@ -416,7 +416,7 @@ else
fi fi
# Load the secrets-common.cfg config. If missing download it. # Load the secrets-common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-common.cfg" source "${configdirserver}/secrets-common.cfg"
else else
@ -425,7 +425,7 @@ else
fi fi
# Load the instance.cfg config. If missing download it. # Load the instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/${selfname}.cfg" source "${configdirserver}/${selfname}.cfg"
else else
@ -434,7 +434,7 @@ else
fi fi
# Load the secrets-instance.cfg config. If missing download it. # Load the secrets-instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-${selfname}.cfg" source "${configdirserver}/secrets-${selfname}.cfg"
else else
@ -456,7 +456,7 @@ else
# Load the linuxgsm.sh in to tmpdir. If missing download it. # Load the linuxgsm.sh in to tmpdir. If missing download it.
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5" fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash"
fi fi
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.

16
tests/tests_fctrserver.sh
View File

@ -60,7 +60,7 @@ githubbranch="${TRAVIS_BRANCH}"
# Core function that is required first. # Core function that is required first.
core_functions.sh(){ core_functions.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
} }
# Bootstrap # Bootstrap
@ -337,7 +337,7 @@ fi
# LinuxGSM installer mode. # LinuxGSM installer mode.
if [ "${shortname}" == "core" ]; then if [ "${shortname}" == "core" ]; then
# Download the latest serverlist. This is the complete list of all supported servers. # Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash"
if [ ! -f "${serverlist}" ]; then if [ ! -f "${serverlist}" ]; then
echo -e "[ FAIL ] serverlist.csv could not be loaded." echo -e "[ FAIL ] serverlist.csv could not be loaded."
exit 1 exit 1
@ -382,7 +382,7 @@ else
# Load the default config. If missing download it. If changed reload it. # Load the default config. If missing download it. If changed reload it.
if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then
mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" mkdir -p "${configdirdefault}/config-lgsm/${gameservername}"
fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash"
fi fi
if [ ! -f "${configdirserver}/_default.cfg" ]; then if [ ! -f "${configdirserver}/_default.cfg" ]; then
mkdir -p "${configdirserver}" mkdir -p "${configdirserver}"
@ -414,7 +414,7 @@ else
source "${configdirserver}/_default.cfg" source "${configdirserver}/_default.cfg"
# Load the common.cfg config. If missing download it. # Load the common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/common.cfg" ]; then if [ ! -f "${configdirserver}/common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/common.cfg" source "${configdirserver}/common.cfg"
else else
@ -423,7 +423,7 @@ else
fi fi
# Load the secrets-common.cfg config. If missing download it. # Load the secrets-common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-common.cfg" source "${configdirserver}/secrets-common.cfg"
else else
@ -432,7 +432,7 @@ else
fi fi
# Load the instance.cfg config. If missing download it. # Load the instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/${selfname}.cfg" source "${configdirserver}/${selfname}.cfg"
else else
@ -441,7 +441,7 @@ else
fi fi
# Load the secrets-instance.cfg config. If missing download it. # Load the secrets-instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-${selfname}.cfg" source "${configdirserver}/secrets-${selfname}.cfg"
else else
@ -451,7 +451,7 @@ else
# Load the linuxgsm.sh in to tmpdir. If missing download it. # Load the linuxgsm.sh in to tmpdir. If missing download it.
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5" fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash"
fi fi
fi fi
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.

16
tests/tests_jc2server.sh
View File

@ -61,7 +61,7 @@ githubbranch="${TRAVIS_BRANCH}"
# Core function that is required first. # Core function that is required first.
core_functions.sh(){ core_functions.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
} }
# Bootstrap # Bootstrap
@ -338,7 +338,7 @@ fi
# LinuxGSM installer mode. # LinuxGSM installer mode.
if [ "${shortname}" == "core" ]; then if [ "${shortname}" == "core" ]; then
# Download the latest serverlist. This is the complete list of all supported servers. # Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash"
if [ ! -f "${serverlist}" ]; then if [ ! -f "${serverlist}" ]; then
echo -e "[ FAIL ] serverlist.csv could not be loaded." echo -e "[ FAIL ] serverlist.csv could not be loaded."
exit 1 exit 1
@ -383,7 +383,7 @@ else
# Load the default config. If missing download it. If changed reload it. # Load the default config. If missing download it. If changed reload it.
if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then
mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" mkdir -p "${configdirdefault}/config-lgsm/${gameservername}"
fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash"
fi fi
if [ ! -f "${configdirserver}/_default.cfg" ]; then if [ ! -f "${configdirserver}/_default.cfg" ]; then
mkdir -p "${configdirserver}" mkdir -p "${configdirserver}"
@ -415,7 +415,7 @@ else
source "${configdirserver}/_default.cfg" source "${configdirserver}/_default.cfg"
# Load the common.cfg config. If missing download it. # Load the common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/common.cfg" ]; then if [ ! -f "${configdirserver}/common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/common.cfg" source "${configdirserver}/common.cfg"
else else
@ -424,7 +424,7 @@ else
fi fi
# Load the secrets-common.cfg config. If missing download it. # Load the secrets-common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-common.cfg" source "${configdirserver}/secrets-common.cfg"
else else
@ -433,7 +433,7 @@ else
fi fi
# Load the instance.cfg config. If missing download it. # Load the instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/${selfname}.cfg" source "${configdirserver}/${selfname}.cfg"
else else
@ -442,7 +442,7 @@ else
fi fi
# Load the secrets-instance.cfg config. If missing download it. # Load the secrets-instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-${selfname}.cfg" source "${configdirserver}/secrets-${selfname}.cfg"
else else
@ -452,7 +452,7 @@ else
# Load the linuxgsm.sh in to tmpdir. If missing download it. # Load the linuxgsm.sh in to tmpdir. If missing download it.
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5" fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash"
fi fi
fi fi
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.

16
tests/tests_mcserver.sh
View File

@ -61,7 +61,7 @@ githubbranch="${TRAVIS_BRANCH}"
# Core function that is required first. # Core function that is required first.
core_functions.sh(){ core_functions.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
} }
# Bootstrap # Bootstrap
@ -338,7 +338,7 @@ fi
# LinuxGSM installer mode. # LinuxGSM installer mode.
if [ "${shortname}" == "core" ]; then if [ "${shortname}" == "core" ]; then
# Download the latest serverlist. This is the complete list of all supported servers. # Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash"
if [ ! -f "${serverlist}" ]; then if [ ! -f "${serverlist}" ]; then
echo -e "[ FAIL ] serverlist.csv could not be loaded." echo -e "[ FAIL ] serverlist.csv could not be loaded."
exit 1 exit 1
@ -383,7 +383,7 @@ else
# Load the default config. If missing download it. If changed reload it. # Load the default config. If missing download it. If changed reload it.
if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then
mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" mkdir -p "${configdirdefault}/config-lgsm/${gameservername}"
fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash"
fi fi
if [ ! -f "${configdirserver}/_default.cfg" ]; then if [ ! -f "${configdirserver}/_default.cfg" ]; then
mkdir -p "${configdirserver}" mkdir -p "${configdirserver}"
@ -415,7 +415,7 @@ else
source "${configdirserver}/_default.cfg" source "${configdirserver}/_default.cfg"
# Load the common.cfg config. If missing download it. # Load the common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/common.cfg" ]; then if [ ! -f "${configdirserver}/common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/common.cfg" source "${configdirserver}/common.cfg"
else else
@ -424,7 +424,7 @@ else
fi fi
# Load the secrets-common.cfg config. If missing download it. # Load the secrets-common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-common.cfg" source "${configdirserver}/secrets-common.cfg"
else else
@ -433,7 +433,7 @@ else
fi fi
# Load the instance.cfg config. If missing download it. # Load the instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/${selfname}.cfg" source "${configdirserver}/${selfname}.cfg"
else else
@ -442,7 +442,7 @@ else
fi fi
# Load the secrets-instance.cfg config. If missing download it. # Load the secrets-instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-${selfname}.cfg" source "${configdirserver}/secrets-${selfname}.cfg"
else else
@ -452,7 +452,7 @@ else
# Load the linuxgsm.sh in to tmpdir. If missing download it. # Load the linuxgsm.sh in to tmpdir. If missing download it.
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5" fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash"
fi fi
fi fi
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.

16
tests/tests_ts3server.sh
View File

@ -61,7 +61,7 @@ githubbranch="${TRAVIS_BRANCH}"
# Core function that is required first. # Core function that is required first.
core_functions.sh(){ core_functions.sh(){
functionfile="${FUNCNAME[0]}" functionfile="${FUNCNAME[0]}"
fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/functions" "core_functions.sh" "${functionsdir}" "chmodx" "run" "noforcedl" "nohash"
} }
# Bootstrap # Bootstrap
@ -338,7 +338,7 @@ fi
# LinuxGSM installer mode. # LinuxGSM installer mode.
if [ "${shortname}" == "core" ]; then if [ "${shortname}" == "core" ]; then
# Download the latest serverlist. This is the complete list of all supported servers. # Download the latest serverlist. This is the complete list of all supported servers.
fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nomd5" fn_bootstrap_fetch_file_github "lgsm/data" "serverlist.csv" "${datadir}" "nochmodx" "norun" "forcedl" "nohash"
if [ ! -f "${serverlist}" ]; then if [ ! -f "${serverlist}" ]; then
echo -e "[ FAIL ] serverlist.csv could not be loaded." echo -e "[ FAIL ] serverlist.csv could not be loaded."
exit 1 exit 1
@ -383,7 +383,7 @@ else
# Load the default config. If missing download it. If changed reload it. # Load the default config. If missing download it. If changed reload it.
if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then if [ ! -f "${configdirdefault}/config-lgsm/${gameservername}/_default.cfg" ]; then
mkdir -p "${configdirdefault}/config-lgsm/${gameservername}" mkdir -p "${configdirdefault}/config-lgsm/${gameservername}"
fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm/${gameservername}" "_default.cfg" "${configdirdefault}/config-lgsm/${gameservername}" "_default.cfg" "nochmodx" "norun" "noforcedl" "nohash"
fi fi
if [ ! -f "${configdirserver}/_default.cfg" ]; then if [ ! -f "${configdirserver}/_default.cfg" ]; then
mkdir -p "${configdirserver}" mkdir -p "${configdirserver}"
@ -415,7 +415,7 @@ else
source "${configdirserver}/_default.cfg" source "${configdirserver}/_default.cfg"
# Load the common.cfg config. If missing download it. # Load the common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/common.cfg" ]; then if [ ! -f "${configdirserver}/common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "common-template.cfg" "${configdirserver}" "common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/common.cfg" source "${configdirserver}/common.cfg"
else else
@ -424,7 +424,7 @@ else
fi fi
# Load the secrets-common.cfg config. If missing download it. # Load the secrets-common.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then if [ ! -f "${configdirserver}/secrets-common.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-common-template.cfg" "${configdirserver}" "secrets-common.cfg" "${chmodx}" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-common.cfg" source "${configdirserver}/secrets-common.cfg"
else else
@ -433,7 +433,7 @@ else
fi fi
# Load the instance.cfg config. If missing download it. # Load the instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "instance-template.cfg" "${configdirserver}" "${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/${selfname}.cfg" source "${configdirserver}/${selfname}.cfg"
else else
@ -442,7 +442,7 @@ else
fi fi
# Load the secrets-instance.cfg config. If missing download it. # Load the secrets-instance.cfg config. If missing download it.
if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then if [ ! -f "${configdirserver}/secrets-${selfname}.cfg" ]; then
fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nomd5" fn_fetch_config "lgsm/config-default/config-lgsm" "secrets-instance-template.cfg" "${configdirserver}" "secrets-${selfname}.cfg" "nochmodx" "norun" "noforcedl" "nohash"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${configdirserver}/secrets-${selfname}.cfg" source "${configdirserver}/secrets-${selfname}.cfg"
else else
@ -452,7 +452,7 @@ else
# Load the linuxgsm.sh in to tmpdir. If missing download it. # Load the linuxgsm.sh in to tmpdir. If missing download it.
if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then
fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nomd5" fn_fetch_file_github "" "linuxgsm.sh" "${tmpdir}" "chmodx" "norun" "noforcedl" "nohash"
fi fi
fi fi
# Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off. # Enables ANSI colours from core_messages.sh. Can be disabled with ansi=off.

Write Preview
Loading…
Cancel
Save