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