From c06107228896b44ec8ceb6fd70d700862899eab4 Mon Sep 17 00:00:00 2001 From: Dwyriel Date: Sat, 23 Sep 2023 10:54:42 -0300 Subject: [PATCH] Extractor scripts: fix bad command arg generation --- contrib/extractor_scripts/ExtractResources.sh | 4 ++-- contrib/extractor_scripts/MoveMapGen.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/extractor_scripts/ExtractResources.sh b/contrib/extractor_scripts/ExtractResources.sh index 703bc082f5..d9fb23d973 100755 --- a/contrib/extractor_scripts/ExtractResources.sh +++ b/contrib/extractor_scripts/ExtractResources.sh @@ -253,7 +253,7 @@ echo | tee -a "$DETAIL_LOG_FILE" if [ "$USE_AD" = "1" ] then echo "$(date): Start extraction of DBCs and map files..." | tee -a "$LOG_FILE" - "$PREFIX"/ad "$AD_RES" "$AD_OPT_RES" | tee -a "$DETAIL_LOG_FILE" + "$PREFIX"/ad $AD_RES $AD_OPT_RES | tee -a "$DETAIL_LOG_FILE" echo "$(date): Extracting of DBCs and map files finished" | tee -a "$LOG_FILE" echo | tee -a "$LOG_FILE" echo | tee -a "$DETAIL_LOG_FILE" @@ -266,7 +266,7 @@ then file=$(mktemp) echo "$(date): Start extraction of vmaps..." | tee -a "$LOG_FILE" # We group command and echo to file so we can save the exit code ($?) before execution of tee overwrites it. - { "$PREFIX"/vmap_extractor "$VMAP_RES" "$VMAP_OPT_RES"; echo $? > "$file"; } | tee -a "$DETAIL_LOG_FILE" + { "$PREFIX"/vmap_extractor $VMAP_RES $VMAP_OPT_RES; echo $? > "$file"; } | tee -a "$DETAIL_LOG_FILE" exit_code=$(cat "$file") if [ "$exit_code" -ne "0" ]; then echo "$(date): Extraction of vmaps failed with errors. Aborting extraction. See the log file for more details." diff --git a/contrib/extractor_scripts/MoveMapGen.sh b/contrib/extractor_scripts/MoveMapGen.sh index 9e845975d3..477c07b075 100644 --- a/contrib/extractor_scripts/MoveMapGen.sh +++ b/contrib/extractor_scripts/MoveMapGen.sh @@ -96,14 +96,14 @@ fi case "$1" in "maps" ) createHeader - "$PREFIX"/MoveMapGen "$PARAMS" "$OFFMESH" "$MMG_RES" --buildGameObjects | tee -a "$DETAIL_LOG_FILE" + "$PREFIX"/MoveMapGen $PARAMS $OFFMESH $MMG_RES --buildGameObjects | tee -a "$DETAIL_LOG_FILE" ;; "offmesh" ) echo "$(date): Recreate offmeshes from file $OFFMESH_FILE" | tee -a "$LOG_FILE" echo "Recreate offmeshes from file $OFFMESH_FILE" | tee -a "$DETAIL_LOG_FILE" while read map tile line do - "$PREFIX"/MoveMapGen "$PARAMS" "$OFFMESH" "$MMG_RES" "$map" --tile "$tile" | tee -a "$DETAIL_LOG_FILE" + "$PREFIX"/MoveMapGen $PARAMS $OFFMESH $MMG_RES "$map" --tile "$tile" | tee -a "$DETAIL_LOG_FILE" echo "$(date): Recreated $map $tile from $OFFMESH_FILE" | tee -a "$LOG_FILE" done < $OFFMESH_FILE & ;;