[beast: 14/16] MISC: make-deb.sh: avoid rebuilding rapicorn is possible

[Tim Janik <timj src gnome org>]

commit 2b16078a0d6e90e12bce335347bc9ecacffbed84
Author: Tim Janik <timj gnu org>
Date:   Thu Sep 7 01:43:40 2017 +0200

    MISC: make-deb.sh: avoid rebuilding rapicorn is possible
    
    Signed-off-by: Tim Janik <timj gnu org>

 misc/make-deb.sh |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/misc/make-deb.sh b/misc/make-deb.sh
index e7a6260..ef774bd 100755
--- a/misc/make-deb.sh
+++ b/misc/make-deb.sh
@@ -86,25 +86,24 @@ echo "PKG_CONFIG_BSE_PREFIX=$PKG_CONFIG_BSE_PREFIX"
 echo "AIDACC_DESTDIR=$AIDACC_DESTDIR"
 echo "DEBIAN=$DEBIAN"
 
-BEASTEXE=$BEASTDIR/bin/beast
-REBUILD=false
-[ -x $DESTDIR/$BEASTEXE ] || REBUILD=true
-if $REBUILD ; then
-
-    # clone/update and build rapicorn
+# clone and build rapicorn
+if ! test -x $DESTDIR/$BEASTDIR/bin/rapidrun ; then
     R=https://github.com/tim-janik/rapicorn.git
     R=../rapicorn/.git/
     test -d $R || R=git://github.com/tim-janik/rapicorn.git
     git_clone $R rapicorn 496351a0798f5ea0eb3eb2419d8d1249853afbc6 # 17.0.0
     build_checked rapicorn ./autogen.sh --prefix="$BEASTDIR"
+fi
 
-    # clone/update and build beast
+# clone and build beast
+BEASTEXE=$BEASTDIR/bin/beast
+if ! test -x $DESTDIR/$BEASTEXE ; then
     R=https://github.com/tim-janik/beast.git
     R=`pwd`/.git
     git_clone $R beast
     build_checked beast ./autogen.sh --with-pkgroot=/opt --prefix=/usr
 fi
-[ -x $DESTDIR/$BEASTEXE ] || die "failed to build Beast executable: $BEASTEXE"
+test -x $DESTDIR/$BEASTEXE || die "failed to build Beast executable: $BEASTEXE"
 
 NAME="beast"
 VERSION=$(./tmpdeb/beast/misc/mkbuildid.sh -p)