Land #1047, use file version number in test scripts

2 files changed, 7 insertions, 5 deletions

diff --git a/scripts/test b/scripts/test
index d093eab..e389728 100755
--- a/scripts/test
+++ b/scripts/test
@@ -13,6 +13,8 @@ fi
 # generate source tree
 ./autogen.sh
 
+VERSION=`cat VERSION`
+
 if [ "$ARCH" = "" ]; then
         ARCH=`uname -m`
 fi
@@ -26,8 +28,8 @@ if [ `uname` = "Darwin" ]; then
         make -j 4 distcheck
 
         # test cmake
-        tar zxvf libressl-*.tar.gz
-        cd libressl-*
+        tar zxvf libressl-$VERSION.tar.gz
+        cd libressl-$VERSION
 
         (
                 mkdir build-static
@@ -61,8 +63,8 @@ elif [ "$ARCH" = "native" ]; then
         # make distribution
         make -j 4 distcheck
 
-        tar zxvf libressl-*.tar.gz
-        cd libressl-*
+        tar zxvf libressl-$VERSION.tar.gz
+        cd libressl-$VERSION
 
 
         # test cmake and ninja
diff --git a/update.sh b/update.sh
index b190ab8..474a0ff 100755
--- a/update.sh
+++ b/update.sh
@@ -149,7 +149,7 @@ else
         $CP $libcrypto_src/opensslv.h include/openssl
 fi
 
-awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 > VERSION
+awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 | head -n1 > VERSION
 echo "LibreSSL version `cat VERSION`"
 
 # copy libcrypto source