From 662438c6a5f25d12146f09c29b0424f2fcb36cbe Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 11 Aug 2013 15:28:46 +0000 Subject: [PATCH] synthesis.sh: fix DONT_BUILD and BUILD_LUNATIC. git-svn-id: https://svn.eduke32.com/eduke32@4002 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/synthesis.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/polymer/synthesis.sh b/polymer/synthesis.sh index e08d6852a..06fd6f452 100755 --- a/polymer/synthesis.sh +++ b/polymer/synthesis.sh @@ -42,12 +42,12 @@ cd $top # update the code repository and get the last revision number from SVN head=`svn update | tail -n1 | awk '{ print $NF }' | cut -d. -f1` echo "HEAD is revision $head." -headlog=`svn log -r HEAD` +headlog=`svn log -r $head` lastrevision=`ls -A1 $output/????????-???? | tail -n1 | cut -d- -f2 | cut -d. -f1` # If the log of HEAD contains DONT_BUILD, obey. -if [ `echo $headlog | grep -q DONT_BUILD` ]; then +if [ -n "`echo $headlog | grep DONT_BUILD`" ]; then echo "HEAD requested to not build. Bailing out..." rm -f $lockfile exit @@ -98,10 +98,10 @@ then echo mv -f mapster32.exe "$package/mapster32.debug.exe" mv -f mapster32.exe "$package/mapster32.debug.exe" - if [ `echo $headlog | grep -q BUILD_LUNATIC` ]; then + if [ -n "`echo $headlog | grep BUILD_LUNATIC`" ]; then # clean the tree and build Lunatic (pre-)release next - echo "${make[@]}" LUNATIC=1 $clean eduke32.exe - "${make[@]}" LUNATIC=1 $clean eduke32.exe + echo "${make[@]}" LUNATIC=1 $clean all + "${make[@]}" LUNATIC=1 $clean all # make sure all the targets were produced for i in "${targets[@]}"; do