From 79bffc87c0b0a4b6b35a190fa64adc34e5ff8005 Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Fri, 29 Jan 2016 05:56:40 -0500
Subject: Update the way the install scrips get the vyos version.

---
 scripts/install/install-image | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/install/install-image')

diff --git a/scripts/install/install-image b/scripts/install/install-image
index c7323fbf..d093d80d 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -63,7 +63,7 @@ fetch_iso_by_url ()
     fi
 
     # This is for statistics collection
-    vyos_version=`dpkg-query --showformat='${Version}' --show vyatta-version`
+    vyos_version=`cat /opt/vyatta/etc/version`
 
     filename="${TEMP_DIR}/${NEW_ISO##*/}"
     curl -L -H "User-Agent: VyOS/$vyos_version" $auth -f -o $filename $NEW_ISO
-- 
cgit v1.2.3


From ecb3ae1ed2a66c0ddc5be25f6cba9fe6c0a0345a Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Fri, 29 Jan 2016 07:05:33 -0500
Subject: Refine getting the vyos version.

---
 scripts/install/install-functions | 4 ++--
 scripts/install/install-image     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/install/install-image')

diff --git a/scripts/install/install-functions b/scripts/install/install-functions
index 0a1f5d13..720ac28a 100755
--- a/scripts/install/install-functions
+++ b/scripts/install/install-functions
@@ -298,7 +298,7 @@ is_union_install ()
 # outputs the version string of the current running version.
 get_cur_version ()
 {
-  ver=`cat /opt/vyatta/etc/version`
+  ver=`cat /opt/vyatta/etc/version | awk '{print $2}'`
   if [ -z "$ver" ]; then
       echo "UNKNOWN"
   else
@@ -323,7 +323,7 @@ get_new_version ()
   ver_file=${ver_path}
   if is_live_cd_boot && [ -f "$ver_file" ]; then
     # we are installing from a live CD boot
-    ver=`cat /opt/vyatta/etc/version`
+    ver=`cat /opt/vyatta/etc/version | awk '{print $2}'`
     echo $ver
     return
   fi
diff --git a/scripts/install/install-image b/scripts/install/install-image
index d093d80d..fd10d0c3 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -63,7 +63,7 @@ fetch_iso_by_url ()
     fi
 
     # This is for statistics collection
-    vyos_version=`cat /opt/vyatta/etc/version`
+    vyos_version=`cat /opt/vyatta/etc/version | awk '{print $2}'`
 
     filename="${TEMP_DIR}/${NEW_ISO##*/}"
     curl -L -H "User-Agent: VyOS/$vyos_version" $auth -f -o $filename $NEW_ISO
-- 
cgit v1.2.3