From bd8351db58eea2a4ad6029613d39d1058487b9bf Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Sat, 27 May 2023 12:00:50 -0700 Subject: [PATCH] build_game.sh: When RADIANT_PATH is set, copy entities.def, radiant.game and radiant.xml (build parms) into the users Radiant gamepack directory. --- build_game.sh | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/build_game.sh b/build_game.sh index 6fbf2cdb..4368bf44 100755 --- a/build_game.sh +++ b/build_game.sh @@ -1,6 +1,31 @@ #!/bin/sh . ./build.cfg +safe_copy() +{ + if [ -f "$1" ] + then + cp -v "$1" "$2" + fi +} + +radiant_build() +{ + # copy files over to RADIANT + if [ ! -z "$RADIANT_PATH" ] + then + if [ -d "$RADIANT_PATH/gamepacks/games" ]; + then + ./make_mapdef.sh "$1" + mkdir -p "$RADIANT_PATH/gamepacks/$1.game/$1/" + safe_copy "./$1/radiant.game" "$RADIANT_PATH/gamepacks/games/$1.game" + safe_copy "./$1/entities.def" "$RADIANT_PATH/gamepacks/$1.game/$1/entities.def" + safe_copy "./$1/radiant.xml" "$RADIANT_PATH/gamepacks/$1.game/default_build_menu.xml" + exit + fi + fi +} + if [ "$SKIP_UPDATE" = "1" ]; then BUILD_UPDATE=0 fi @@ -34,7 +59,7 @@ if [ -x "$(command -v fteqcc)" ]; then make cd "$SCRPATH" - ./make_mapdef.sh "$1" + radiant_build "$1" exit 0 fi @@ -70,10 +95,8 @@ if [ -x "$(command -v fteqcc)" ]; then cd .. export GAMEDIR=$(basename $PWD) cd $OLDDIR - if [ -f "$SCRPATH"/bin/worldspawn ]; then - ./make_mapdef.sh $GAMEDIR - fi + radiant_build "$GAMEDIR" done; else printf "FTEQCC compiler is not present, please run build_engine.sh\n" -fi +fi \ No newline at end of file