X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fscripts%2Fversion;h=807109e4103465ba0c012fc7510a88e0768659b4;hb=b4e5e50fe;hp=af4472869123f0c488ce48a9fde8a7506126ca30;hpb=99c201964ab7514e55d66ad2ca5bbe68440bd75b;p=vpp.git

diff --git a/src/scripts/version b/src/scripts/version
index af447286912..807109e4103 100755
--- a/src/scripts/version
+++ b/src/scripts/version
@@ -1,19 +1,28 @@
 #!/bin/bash
 
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 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
 
@@ -50,5 +59,5 @@ fi
       echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
     fi
   else
-    echo ${TAG}
+    echo ${TAG}-release
 fi