Browse Source

Merge branch 'fix/1318-ui-update-versioning' into staging/fixes

Kristan Kenney 5 years ago
parent
commit
47beb4f1a7
1 changed files with 3 additions and 3 deletions
  1. 3 3
      bin/v-list-sys-hestia-updates

+ 3 - 3
bin/v-list-sys-hestia-updates

@@ -68,7 +68,7 @@ php_v=$(apt-cache policy hestia-php | grep Candidate | cut -d ':' -f 2 | xargs)
 dpkg_data=$(dpkg-query -s hestia)
 pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia.list)
 ARCH=$(echo "$dpkg_data"|grep Architecture |cut -f 2 -d ' ')
-VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
+VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' ')
 DATE=$(date -d @$pkg_date +"%F")
 TIME=$(date -d @$pkg_date +"%T")
 
@@ -84,7 +84,7 @@ data="$data UPDATED='$UPDATED' DESCR='core package' TIME='$TIME' DATE='$DATE'"
 dpkg_data=$(dpkg-query -s hestia-php)
 pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia-php.list)
 ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
-VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
+VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' ')
 DATE=$(date -d @$pkg_date +"%F")
 TIME=$(date -d @$pkg_date +"%T")
 
@@ -101,7 +101,7 @@ data="$data TIME='$TIME' DATE='$DATE'"
 dpkg_data=$(dpkg-query -s hestia-nginx)
 pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/hestia-nginx.list)
 ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
-VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-)
+VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' ')
 DATE=$(date -d @$pkg_date +"%F")
 TIME=$(date -d @$pkg_date +"%T")