Просмотр исходного кода

Rework update checker to support different versions.

Raphael Schneeberger 7 лет назад
Родитель
Сommit
7e50fec992
1 измененных файлов с 12 добавлено и 2 удалено
  1. 12 2
      bin/v-list-sys-hestia-updates

+ 12 - 2
bin/v-list-sys-hestia-updates

@@ -61,7 +61,9 @@ shell_list() {
 #----------------------------------------------------------#
 
 # Checking official latest version
-latest=$(wget -q -T 1 -t 1 https://gpg.hestiacp.com/latest.txt -O -)
+hestia_v=$(apt-cache policy hestia | grep Candidate | cut -d ':' -f 2 | xargs)
+nginx_v=$(apt-cache policy hestia-nginx | grep Candidate | cut -d ':' -f 2 | xargs)
+php_v=$(apt-cache policy hestia-php | grep Candidate | cut -d ':' -f 2 | xargs)
 
 # Checking installed hestia version
 if [ -d "/etc/sysconfig" ]; then
@@ -82,7 +84,7 @@ else
     TIME=$(date -d @$pkg_date +"%T")
 fi
 UPDATED='yes'
-if [ ! -z "$latest" ] && [ "$latest" \> "$VERSION-$RELEASE" ]; then
+if [ ! -z "$hesta_v" ] && [ "$hestia_v" \> "$VERSION-$RELEASE" ]; then
     UPDATED='no'
 fi
 data="NAME='hestia' VERSION='$VERSION' RELEASE='$RELEASE' ARCH='$ARCH'"
@@ -102,6 +104,10 @@ else
     DATE=$(date -d @$pkg_date +"%F")
     TIME=$(date -d @$pkg_date +"%T")
 fi
+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'"
@@ -120,6 +126,10 @@ else
     DATE=$(date -d @$pkg_date +"%F")
     TIME=$(date -d @$pkg_date +"%T")
 fi
+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'"