Remove legacy code from v-list-sys-hestia-updates

Author: Kristan Kenney

bin/v-list-sys-hestia-updates

@@ -66,70 +66,54 @@ nginx_v=$(apt-cache policy hestia-nginx | grep Candidate | cut -d ':' -f 2 | xar
 php_v=$(apt-cache policy hestia-php | grep Candidate | cut -d ':' -f 2 | xargs)
 
 # Checking installed hestia version
-if [ -d "/etc/sysconfig" ]; then
-    rpm_format="VERSION='%{VERSION}'"
-    rpm_format="$rpm_format RELEASE='%{RELEASE}'"
-    rpm_format="$rpm_format ARCH='%{ARCH}'"
-    rpm_format="$rpm_format UTIME='%{INSTALLTIME}'\n"
-    eval $(rpm --queryformat="$rpm_format" -q hestia)
-    DATE=$(date -d @$UTIME +%F)
-    TIME=$(date -d @$UTIME +%T)
-else
-    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 \-)
-    RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
-    DATE=$(date -d @$pkg_date +"%F")
-    TIME=$(date -d @$pkg_date +"%T")
-fi
+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 \-)
+RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
+DATE=$(date -d @$pkg_date +"%F")
+TIME=$(date -d @$pkg_date +"%T")
+
 UPDATED='yes'
 if [ ! -z "$hesta_v" ] && [ "$hestia_v" \> "$VERSION-$RELEASE" ]; then
     UPDATED='no'
 fi
+
 data="NAME='hestia' VERSION='$VERSION' RELEASE='$RELEASE' ARCH='$ARCH'"
 data="$data UPDATED='$UPDATED' DESCR='core package' TIME='$TIME' DATE='$DATE'"
 
 # Checking installed hestia-php version
-if [ -d "/etc/sysconfig" ]; then
-    eval $(rpm --queryformat="$rpm_format" -q hestia-php)
-    DATE=$(date -d @$UTIME +%F)
-    TIME=$(date -d @$UTIME +%T)
-else
-    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 \-)
-    RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
-    DATE=$(date -d @$pkg_date +"%F")
-    TIME=$(date -d @$pkg_date +"%T")
-fi
+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 \-)
+RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
+DATE=$(date -d @$pkg_date +"%F")
+TIME=$(date -d @$pkg_date +"%T")
+
 UPDATED='yes'
 if [ ! -z "$php_v" ] && [ "$php_v" \> "$VERSION-$RELEASE" ]; then
     UPDATED='no'
 fi
+
 data="$data\nNAME='hestia-php' VERSION='$VERSION' RELEASE='$RELEASE'"
 data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='php interpreter'"
 data="$data TIME='$TIME' DATE='$DATE'"
 
 # Checking installed hestia-nginx version
-if [ -d "/etc/sysconfig" ]; then
-    eval $(rpm --queryformat="$rpm_format" -q hestia-nginx)
-    DATE=$(date -d @$UTIME +%F)
-    TIME=$(date -d @$UTIME +%T)
-else
-    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 \-)
-    RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
-    DATE=$(date -d @$pkg_date +"%F")
-    TIME=$(date -d @$pkg_date +"%T")
-fi
+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 \-)
+RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-)
+DATE=$(date -d @$pkg_date +"%F")
+TIME=$(date -d @$pkg_date +"%T")
+
 UPDATED='yes'
 if [ ! -z "$nginx_v" ] && [ "$nginx_v" \> "$VERSION-$RELEASE" ]; then
     UPDATED='no'
 fi
+
 data="$data\nNAME='hestia-nginx' VERSION='$VERSION' RELEASE='$RELEASE'"
 data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='internal web server'"
 data="$data TIME='$TIME' DATE='$DATE'"