tyler.durden/harbian-audit
1
0
Fork 0
mirror of https://github.com/hardenedlinux/harbian-audit.git synced 2025-07-31 01:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bug for utils.

Browse Source
This commit is contained in:
Samson-W 2019-08-17 23:32:25 +08:00
parent 1d77dbee83
commit 23b28bafc4
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/utils.sh
View File

@ -7,6 +7,7 @@
is_debian_9() is_debian_9()
{ {
if [ -r /etc/debian_version ]
if $(cat /etc/debian_version | grep -q "^9.[0-9]"); then if $(cat /etc/debian_version | grep -q "^9.[0-9]"); then
debug "Debian version is 9.*." debug "Debian version is 9.*."
FNRET=0 FNRET=0
@ -14,10 +15,15 @@ is_debian_9()
debug "Debian version is not 9.*." debug "Debian version is not 9.*."
FNRET=1 FNRET=1
fi fi
else
debug "Current OS is not Debian."
FNRET=2
fi
} }
is_debian_10() is_debian_10()
{ {
if [ -r /etc/debian_version ]
if $(cat /etc/debian_version | grep -q "^10.[0-9]"); then if $(cat /etc/debian_version | grep -q "^10.[0-9]"); then
debug "Debian version is buster/10." debug "Debian version is buster/10."
FNRET=0 FNRET=0
@ -25,6 +31,10 @@ is_debian_10()
debug "Debian version is not buster/10." debug "Debian version is not buster/10."
FNRET=1 FNRET=1
fi fi
else
debug "Current OS is not Debian."
FNRET=2
fi
} }
is_64bit_arch() is_64bit_arch()
@ -546,7 +556,6 @@ is_pkg_installed()
verify_integrity_all_packages() verify_integrity_all_packages()
{ {
if [ $OS_RELEASE -eq 2 ]; then if [ $OS_RELEASE -eq 2 ]; then
set +e
rpm -Va > /dev/shm/yum_verify_ret rpm -Va > /dev/shm/yum_verify_ret
COUNT=$(cat /dev/shm/yum_verify_ret | wc -l ) COUNT=$(cat /dev/shm/yum_verify_ret | wc -l )
if [ $COUNT -gt 0 ]; then if [ $COUNT -gt 0 ]; then
@ -558,7 +567,6 @@ verify_integrity_all_packages()
debug "Verify integrity all packages is OK" debug "Verify integrity all packages is OK"
FNRET=0 FNRET=0
fi fi
set -e
else else
dpkg -V > /dev/shm/dpkg_verify_ret dpkg -V > /dev/shm/dpkg_verify_ret
if [ $(cat /dev/shm/dpkg_verify_ret | wc -l) -gt 0 ]; then if [ $(cat /dev/shm/dpkg_verify_ret | wc -l) -gt 0 ]; then