Skip to content

Commit

Permalink
Extractor scripts: fix bad command arg generation
Browse files Browse the repository at this point in the history
  • Loading branch information
Dwyriel committed Sep 23, 2023
1 parent 2f61c81 commit eaa38a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions contrib/extractor_scripts/ExtractResources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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."
Expand Down
4 changes: 2 additions & 2 deletions contrib/extractor_scripts/MoveMapGen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ 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 &
;;
Expand Down

0 comments on commit eaa38a9

Please sign in to comment.