evolix/evocheck
evolix/evocheck
21
2
Fork 2
Code Issues 48 Pull requests 5 Releases 37 Wiki Activity

improve readability

Browse source
This commit is contained in:
Jérémy Lecour 2019-03-22 20:02:04 +01:00
parent 0afdfbf3a1
commit 7cb7a47be7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
evocheck.sh
View file

@ -505,9 +505,11 @@ if is_debian; then
# Verification de l'activation de Squid dans le cas d'un pack mail
if [ "$IS_SQUID" = 1 ]; then
squidconffile="/etc/squid*/squid.conf"
is_debian_stretch && squidconffile=/etc/squid/evolinux-custom.conf
if is_debian_stretch; then
squidconffile="/etc/squid/evolinux-custom.conf"
else
squidconffile="/etc/squid*/squid.conf"
fi
if is_pack_web && (is_installed squid || is_installed squid3); then
host=$(hostname -i)
http_port=$(grep "http_port" $squidconffile | cut -f 2 -d " ")
@ -1018,8 +1020,7 @@ if is_debian; then
BLKID_BIN=$(command -v blkid)
if [ -x "$BLKID_BIN" ]; then
tmpFile=$(mktemp -p /tmp)
parts=$($BLKID_BIN | grep -ve raid_member -e EFI_SYSPART \
| grep -Eo ' LABEL=".*"' | cut -d'"' -f2)
parts=$($BLKID_BIN | grep -ve raid_member -e EFI_SYSPART | grep -Eo ' LABEL=".*"' | cut -d'"' -f2)
for part in $parts; do
echo "$part" >> "$tmpFile"
done