[beast] TRAVIS: rename $BEASTAPTSOURCE

[Tim Janik <timj src gnome org>]

commit 9c258a98d2cb51109566ce0792bb3eb61bfcb103
Author: Tim Janik <timj gnu org>
Date:   Thu Apr 7 19:52:14 2016 +0200

    TRAVIS: rename $BEASTAPTSOURCE
    
    Signed-off-by: Tim Janik <timj gnu org>

 .travis.docker |    4 ++--
 .travis.yml    |   13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/.travis.docker b/.travis.docker
index 5fd47a0..faa674f 100644
--- a/.travis.docker
+++ b/.travis.docker
@@ -22,9 +22,9 @@ RUN retry apt-get update && retry apt-get -y install apt-utils && retry apt-get
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 379CE192D401AB61
 
 # Install Rapicorn packages
-ENV BINTRAYREPO "@BINTRAYREPO@"
+ENV BEASTAPTSOURCE "@BEASTAPTSOURCE@"
 RUN retry apt-get -y install apt-transport-https ca-certificates && \
-    echo "$BINTRAYREPO" | tee /etc/apt/sources.list.d/bintray-beast-team.list && \
+    echo "$BEASTAPTSOURCE" | tee /etc/apt/sources.list.d/beast-team.list && \
     retry apt-get update && retry apt-get -y install rapicorn
 
 # Provide build essentials and dependencies
diff --git a/.travis.yml b/.travis.yml
index 14ee953..015abc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,10 +29,13 @@ matrix:
   fast_finish: true
 
 before_install:
-  # Build variable setup
-  - export DISTNAME="${DIST%:*}" DISTRELEASE="${DIST#*:}" # Example: DIST=debian:jessie DISTNAME=debian 
DISTRELEASE=jessie
-  - export BINTRAYREPO="deb [trusted=yes] https://dl.bintray.com/beast-team/deb $DISTRELEASE main"
-  - echo "INTENT=$INTENT DIST=$DIST DISTNAME=$DISTNAME DISTRELEASE=$DISTRELEASE BINTRAYREPO='$BINTRAYREPO'"
+  # buildtool.sh requires complete history for monotonic revisioning
+  - travis_retry git fetch --unshallow
+  # Build variable setup; example: DIST=debian:jessie DISTNAME=debian DISTRELEASE=jessie
+  - true &&
+    export DISTNAME="${DIST%:*}" DISTRELEASE="${DIST#*:}" &&
+    export BEASTAPTSOURCE="deb [trusted=yes] https://dl.bintray.com/beast-team/deb $DISTRELEASE main" &&
+    echo "INTENT=$INTENT DIST=$DIST DISTNAME=$DISTNAME DISTRELEASE=$DISTRELEASE 
BEASTAPTSOURCE='$BEASTAPTSOURCE'"
   # Sample environment
   - uname -a
   - cat /etc/os-release
@@ -43,8 +46,6 @@ before_install:
   - $CC --version
 
 install:
-  # Complete history is required for monotonic revisioning
-  - travis_retry git fetch --unshallow
   # Configure Dockerfile by substituting @VAR@ with $VAR
   - ./buildtool.sh applyenv .travis.docker > Dockerfile
   # Build and run tests, create packages