Skip to content

Commit 4c44339

Browse files
committed
dpkg-query support
1 parent 82a7469 commit 4c44339

File tree

1 file changed

+43
-15
lines changed

1 file changed

+43
-15
lines changed

bin/v-list-sys-vesta-updates

+43-15
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,24 @@ tmp_file=$(mktemp)
2929
# Check latest version
3030
wget -q -T 1 -t 1 http://c.vestacp.com/latest.txt -O $tmp_file
3131

32-
# Define rpm query format
33-
rpm_format="VERSION='%{VERSION}'"
34-
rpm_format="$rpm_format RELEASE='%{RELEASE}'"
35-
rpm_format="$rpm_format ARCH='%{ARCH}'"
36-
rpm_format="$rpm_format UTIME='%{INSTALLTIME}'\n"
37-
3832
# Check vesta version
39-
eval $(rpm --queryformat="$rpm_format" -q vesta)
40-
DATE=$(date -d @$UTIME +%F)
41-
TIME=$(date -d @$UTIME +%T)
33+
if [ -e "/etc/redhat-release" ]; then
34+
rpm_format="VERSION='%{VERSION}'"
35+
rpm_format="$rpm_format RELEASE='%{RELEASE}'"
36+
rpm_format="$rpm_format ARCH='%{ARCH}'"
37+
rpm_format="$rpm_format UTIME='%{INSTALLTIME}'\n"
38+
eval $(rpm --queryformat="$rpm_format" -q vesta)
39+
DATE=$(date -d @$UTIME +%F)
40+
TIME=$(date -d @$UTIME +%T)
41+
else
42+
dpkg_data=$(dpkg-query -s vesta)
43+
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/vesta.list)
44+
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
45+
VERSION=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 1 -d \-)
46+
RELEASE=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 2 -d \-)
47+
DATE=$(date -d @$pkg_date +"%F")
48+
TIME=$(date -d @$pkg_date +"%T")
49+
fi
4250
latest=$(grep vesta $tmp_file)
4351
UPDATED='yes'
4452
if [ ! -z "$latest" ] && [ "$latest" != "vesta-$VERSION-$RELEASE" ]; then
@@ -49,9 +57,19 @@ str="NAME='vesta' VERSION='$VERSION' RELEASE='$RELEASE' ARCH='$ARCH'"
4957
str="$str UPDATED='$UPDATED' DESCR='core package' TIME='$TIME' DATE='$DATE'"
5058

5159
# Check vesta-php version
52-
eval $(rpm --queryformat="$rpm_format" -q vesta-php)
53-
DATE=$(date -d @$UTIME +%F)
54-
TIME=$(date -d @$UTIME +%T)
60+
if [ -e "/etc/redhat-release" ]; then
61+
eval $(rpm --queryformat="$rpm_format" -q vesta-php)
62+
DATE=$(date -d @$UTIME +%F)
63+
TIME=$(date -d @$UTIME +%T)
64+
else
65+
dpkg_data=$(dpkg-query -s vesta-php)
66+
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/vesta-php.list)
67+
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
68+
VERSION=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 1 -d \-)
69+
RELEASE=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 2 -d \-)
70+
DATE=$(date -d @$pkg_date +"%F")
71+
TIME=$(date -d @$pkg_date +"%T")
72+
fi
5573
latest=$(grep php $tmp_file)
5674
UPDATED='yes'
5775
if [ ! -z "$latest" ] && [ "$latest" != "php-$VERSION-$RELEASE" ]; then
@@ -63,9 +81,19 @@ str="$str UPDATED='$UPDATED' DESCR='php interpreter' TIME='$TIME'"
6381
str="$str DATE='$DATE'"
6482

6583
# Check vesta-nginx version
66-
eval $(rpm --queryformat="$rpm_format" -q vesta-nginx)
67-
DATE=$(date -d @$UTIME +%F)
68-
TIME=$(date -d @$UTIME +%T)
84+
if [ -e "/etc/redhat-release" ]; then
85+
eval $(rpm --queryformat="$rpm_format" -q vesta-nginx)
86+
DATE=$(date -d @$UTIME +%F)
87+
TIME=$(date -d @$UTIME +%T)
88+
else
89+
dpkg_data=$(dpkg-query -s vesta-nginx)
90+
pkg_date=$(stat -c "%Y" /var/lib/dpkg/info/vesta-nginx.list)
91+
ARCH=$(echo "$dpkg_data"|grep Architecture | cut -f 2 -d ' ')
92+
VERSION=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 1 -d \-)
93+
RELEASE=$(echo "$dpkg_data"|grep Version |cut -f 2 -d ' '|cut -f 2 -d \-)
94+
DATE=$(date -d @$pkg_date +"%F")
95+
TIME=$(date -d @$pkg_date +"%T")
96+
fi
6997
latest=$(grep nginx $tmp_file)
7098
UPDATED='yes'
7199
if [ ! -z "$latest" ] && [ "$latest" != "nginx-$VERSION-$RELEASE" ]; then

0 commit comments

Comments
 (0)