diff --git a/build_byond.sh b/build_byond.sh index 4b107a9d28..64ef163fee 100755 --- a/build_byond.sh +++ b/build_byond.sh @@ -4,19 +4,11 @@ set -e retval=1 source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup -ls $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin -file $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/DreamMaker - -if hash $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/DreamMaker 2>/dev/null +DreamMaker $DMEName 2>&1 | tee result.log +retval=$? +if ! grep '\- 0 errors, 0 warnings' result.log then - $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/DreamMaker $DMEName 2>&1 | tee result.log - retval=$? - if ! grep '\- 0 errors, 0 warnings' result.log - then - retval=1 #hard fail, due to warnings or errors - fi -else - echo "Couldn't find the DreamMaker executable, aborting." - retval=2 + retval=1 #hard fail, due to warnings or errors fi + exit $retval \ No newline at end of file