Skip to content

Commit 8124194

Browse files
Merge pull request #72 from 404GamerNotFound/codex/behebe-entitat-nicht-verfugbar-auf-servern
Ensure OS fallback when PRETTY_NAME missing
2 parents 7862297 + 5d85ee6 commit 8124194

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

addon/vserver_ssh_stats/app/remote_script.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
REMOTE_SCRIPT = r'''
22
set -e
3+
set -o pipefail
34
export LC_ALL=C
45
export LANG=C
56
# CPU %
@@ -57,15 +58,17 @@
5758
pkg_count=0
5859
pkg_list=""
5960
if command -v apt-get >/dev/null 2>&1; then
60-
updates=$(apt-get -s upgrade 2>/dev/null | awk '/^Inst /{print $2}')
61+
# Ignore non-zero exit codes so the script keeps running even if the
62+
# package manager encounters an error or missing permissions.
63+
updates=$( (apt-get -s upgrade 2>/dev/null || true) | awk '/^Inst /{print $2}')
6164
pkg_count=$(echo "$updates" | wc -l)
6265
pkg_list=$(echo "$updates" | head -n 10 | tr '\n' ',' | sed 's/,$//')
6366
elif command -v dnf >/dev/null 2>&1; then
64-
updates=$(dnf -q check-update --refresh 2>/dev/null | awk '/^[[:alnum:].-]+[[:space:]]/ {print $1}')
67+
updates=$( (dnf -q check-update --refresh 2>/dev/null || true) | awk '/^[[:alnum:].-]+[[:space:]]/ {print $1}')
6568
pkg_count=$(echo "$updates" | wc -l)
6669
pkg_list=$(echo "$updates" | head -n 10 | tr '\n' ',' | sed 's/,$//')
6770
elif command -v yum >/dev/null 2>&1; then
68-
updates=$(yum -q check-update 2>/dev/null | awk '/^[[:alnum:].-]+[[:space:]]/ {print $1}')
71+
updates=$( (yum -q check-update 2>/dev/null || true) | awk '/^[[:alnum:].-]+[[:space:]]/ {print $1}')
6972
pkg_count=$(echo "$updates" | wc -l)
7073
pkg_list=$(echo "$updates" | head -n 10 | tr '\n' ',' | sed 's/,$//')
7174
fi

custom_components/vserver_ssh_stats/remote_script.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
REMOTE_SCRIPT = r'''
22
set -e
3+
set -o pipefail
34
export LC_ALL=C
45
export LANG=C
56
# CPU %

0 commit comments

Comments
 (0)