From: David Schweikert <david@schweikert.ch>
Date: Sun, 2 Mar 2014 22:39:05 +0000 (+0100)
Subject: travis tuning
X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e07a6e9dfcbff534889062059716acb3e73df4ca;p=fping.git

travis tuning
---

diff --git a/.travis.yml b/.travis.yml
index d1cca2a..3b987eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ install:
 script:
     - ci/build-2-install.sh
     - prove ci/test-*.pl
-    - make dist
     - ci/test-tarball.sh
 after_success:
     - ci/deploy-bintray.sh
diff --git a/ci/deploy-bintray.sh b/ci/deploy-bintray.sh
index c693bae..9c535a3 100755
--- a/ci/deploy-bintray.sh
+++ b/ci/deploy-bintray.sh
@@ -4,7 +4,6 @@
 
 set -e
 
-make dist
 VERSION=$(ls fping-*.tar.gz | sed -e 's/^fping-//' | sed -e 's/\.tar\.gz$//')
 if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+$ ]]; then
     REPO=release
diff --git a/ci/test-tarball.sh b/ci/test-tarball.sh
index efb8fbe..0f6c2d4 100755
--- a/ci/test-tarball.sh
+++ b/ci/test-tarball.sh
@@ -6,8 +6,9 @@
 set -e
 set -x
 
-TARFILE=fping-*.tar.gz
-if [ ! -f "$TARFILE" ]; then
+make dist
+VERSION=$(ls fping-*.tar.gz | sed -e 's/^fping-//' | sed -e 's/\.tar\.gz$//')
+if [ -z "$VERSION" ]; then
     echo "tar.gz file not found." >&2
     exit 1
 fi
@@ -15,7 +16,7 @@ fi
 # unarchive
 TMPDIR=$(mktemp -d --tmpdir=.)
 cd $TMPDIR
-tar xf ../$TARFILE
+tar xf ../fping-$VERSION.tar.gz
 DIRNAME=$(ls)
 
 # build