mirror of
https://github.com/munin-monitoring/muninlite.git
synced 2024-09-27 21:31:31 +02:00
Simplify grep-based conditionals
The "-q" argument avoids the requirement for output redirections.
This commit is contained in:
parent
94a695860d
commit
0600bbf113
@ -1,6 +1,6 @@
|
|||||||
config_cpu() {
|
config_cpu() {
|
||||||
extinfo=""
|
extinfo=""
|
||||||
if grep '^cpu \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\}' /proc/stat >/dev/null 2>&1; then
|
if grep -q '^cpu \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\}' /proc/stat; then
|
||||||
extinfo="iowait irq softirq"
|
extinfo="iowait irq softirq"
|
||||||
fi
|
fi
|
||||||
# shellcheck disable=SC2126
|
# shellcheck disable=SC2126
|
||||||
@ -68,7 +68,7 @@ config_cpu() {
|
|||||||
}
|
}
|
||||||
fetch_cpu() {
|
fetch_cpu() {
|
||||||
extinfo=""
|
extinfo=""
|
||||||
if grep '^cpu \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\}' /proc/stat >/dev/null 2>&1; then
|
if grep -q '^cpu \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\} \{1,\}[0-9]\{1,\}' /proc/stat; then
|
||||||
extinfo="iowait irq softirq"
|
extinfo="iowait irq softirq"
|
||||||
fi
|
fi
|
||||||
CINFO=$(grep '^cpu ' /proc/stat | cut -c6-)
|
CINFO=$(grep '^cpu ' /proc/stat | cut -c6-)
|
||||||
|
Loading…
Reference in New Issue
Block a user