From c06eeb0e3c9c1a9fa8f913e2d785b03220bfdabd Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 18 Apr 2017 15:26:39 +0200
Subject: Fix "make dist" to include version number, docouple it from rpm
 packaging

Change-Id: If2f9976d668089026c97b897cf449bff09050631
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 src/scripts/version | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/scripts/version')

diff --git a/src/scripts/version b/src/scripts/version
index d92eb8b70fc..d8728a9f6a8 100755
--- a/src/scripts/version
+++ b/src/scripts/version
@@ -4,16 +4,12 @@ path=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
 
 cd "$path"
 
-git rev-parse 2> /dev/null
-if [ $? == 0 ]; then
-    vstring=$(git describe)
-elif [ -f .version ]; then
+if [ -f .version ]; then
     vstring=$(cat .version)
 else
-    if [ -f ../rpm/*.gz ]; then
-        vstring=$(ls ../rpm/*.gz)
-    else
-        exit 1
+    vstring=$(git describe)
+    if [ $? != 0 ]; then
+      exit 1
     fi
 fi
 
-- 
cgit 1.2.3-korg