From eb28616ca1c69184b7b2b4cf4ba96cf4df29f978 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Mon, 18 Feb 2019 09:22:44 -0500
Subject: JVPP-22: Update packaging

 - rpm package name update according to naming conventions
 - vpp instalation verification
 - update versioning script

Change-Id: I962895ce636aec949930ea452d1e924024c4b780
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 version | 47 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 10 deletions(-)

(limited to 'version')

diff --git a/version b/version
index 55f8754..a9c6126 100755
--- a/version
+++ b/version
@@ -17,11 +17,11 @@ path=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
 
 cd "$path"
 
-if [ -f .version ]; then
+if [[ -f .version ]]; then
     vstring=$(cat .version)
 else
     vstring=$(git describe)
-    if [ $? != 0 ]; then
+    if [[ $? != 0 ]]; then
       exit 1
     fi
 fi
@@ -30,30 +30,57 @@ TAG=$(echo ${vstring} | cut -d- -f1 | sed -e 's/^v//')
 ADD=$(echo ${vstring} | cut -s -d- -f2)
 
 git rev-parse 2> /dev/null
-if [ $? == 0 ]; then
+if [[ $? == 0 ]]; then
     CMT=$(git describe --dirty --long | cut -s -d- -f3,4)
 else
     CMT=$(echo ${vstring} | cut -s -d- -f3,4)
 fi
-CMTR=$(echo $CMT | sed 's/-/_/')
+CMTR=$(echo ${CMT} | sed 's/-/_/')
 
-if [ -n "${BUILD_NUMBER}" ]; then
+if [[ -n "${BUILD_NUMBER}" ]]; then
        BLD="~b${BUILD_NUMBER}"
 fi
 
-if [ "$1" = "rpm-version" ]; then
+if [[ "$1" = "rpm-version" ]]; then
   echo ${TAG}
   exit
 fi
 
-if [ "$1" = "rpm-release" ]; then
-  [ -z "${ADD}" ] && echo release && exit
+if [[ "$1" = "rpm-release" ]]; then
+  [[ -z "${ADD}" ]] && echo release && exit
   echo ${ADD}${CMTR:+~${CMTR}}${BLD}
   exit
 fi
 
-  if [ -n "${ADD}" ]; then
-    if [ "$1" = "rpm-string" ]; then
+if [[ "$1" = "deb-vpp-version" ]]; then
+  vpp_version=`dpkg -l vpp |grep vpp |awk '{print $3}'`
+  echo ${vpp_version}
+  exit
+fi
+
+if [[ "$1" = "rpm-vpp-version" ]]; then
+  vpp_version=`yum list installed vpp |grep vpp |awk -F' ' '{print $2}'`
+  echo ${vpp_version}
+  exit
+fi
+
+
+if [[ "$1" = "os-version-id" ]]; then
+  [[ -z "${ADD}" ]] && echo release && exit
+  source /etc/os-release
+  echo ${VERSION_ID}
+  exit
+fi
+if [[ "$1" = "os-id" ]]; then
+  [[ -z "${ADD}" ]] && echo release && exit
+  source /etc/os-release
+  echo ${ID}
+  exit
+fi
+
+
+  if [[ -n "${ADD}" ]]; then
+    if [[ "$1" = "rpm-string" ]]; then
       echo ${TAG}-${ADD}${CMTR:+~${CMTR}}${BLD}
     else
       echo ${TAG}-${ADD}${CMT:+~${CMT}}${BLD}
-- 
cgit 1.2.3-korg