From 17093194969175e643913f72e9cf91069be667d2 Mon Sep 17 00:00:00 2001 From: Mitch Weaver Date: Mon, 20 Nov 2023 21:50:56 -0600 Subject: [PATCH] asdf --- modserver/globals.sh | 4 ++-- modserver/update_mods.sh | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/modserver/globals.sh b/modserver/globals.sh index ebda81e..9afa644 100644 --- a/modserver/globals.sh +++ b/modserver/globals.sh @@ -33,10 +33,10 @@ alias do_sync='rsync -rvltDhu --delete --partial --progress' ################### GLOBAL FUNCTIONS ######################### msg() { - printf '[*] %s\n' "$*" + printf '\n[*] %s\n\n' "$*" } errmsg() { - >&2 printf '[Error]: %s\n' "$*" + >&2 printf '\n[Error]: %s\n\n' "$*" } die() { errmsg "$*" diff --git a/modserver/update_mods.sh b/modserver/update_mods.sh index 7a2eda0..97c17c6 100644 --- a/modserver/update_mods.sh +++ b/modserver/update_mods.sh @@ -66,9 +66,7 @@ fi # 05. Begin functions # =================================================== update_server() { - echo msg "============== UPDATING DAYZ SERVER =================" - echo steamcmd -tcp \ +force_install_dir "$LOCAL_STOCK_SERVER" \ +@sSteamCmdForcePlatformType windows \ @@ -79,15 +77,11 @@ update_server() { is_network_drive_mounted && do_sync "$LOCAL_STOCK_SERVER"/ "$REMOTE_STOCK_SERVER" - echo msg "============ DONE UPDATING SERVER =====================" - echo } update_game() { - echo msg "========== UPDATING DAYZ GAME ================" - echo steamcmd -tcp \ +force_install_dir "$LOCAL_STOCK_GAME" \ +@sSteamCmdForcePlatformType windows \ @@ -98,16 +92,12 @@ update_game() { is_network_drive_mounted && do_sync "$LOCAL_STOCK_GAME"/ "$REMOTE_STOCK_GAME" - echo msg "============= DONE UPDATING GAME ===================" - echo } # args: $1 = server_modlist.txt to update update_mods_for_server() { - echo msg "======= UPDATING MODS FOR: $1 ========" - echo mods_file="$MODLISTS/$1" map_name=${1%.txt} @@ -159,9 +149,7 @@ update_mods_for_server() { die "Problem downloading mods for $map_name" fi - echo msg "------------ RENAMING MODS -------------" - echo mods_to_copy="$LOCAL_MODS/mods_to_copy" rm -rf "$mods_to_copy" 2>/dev/null ||: mkdir -p "$mods_to_copy" @@ -183,17 +171,13 @@ update_mods_for_server() { esac done < "$mods_file" - echo msg "----------- SYNCING MODS -------------" - echo do_sync "$mods_to_copy"/ "$REMOTE_MODS" rm -f "$tempfile" 2>/dev/null ||: unset tempfile mod map_name mods_file mods_to_copy mod_name mod_id - echo msg "======= DONE UPDATING MODS FOR: $1 ========" - echo } update_stock_maps() {