Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion core/core.func
Original file line number Diff line number Diff line change
Expand Up @@ -2418,7 +2418,9 @@ apt_update_safe() {
# with it. APT_CONFIG is read after apt.conf.d and dies with the process, so an
# early exit cannot leave a drop-in behind.
_cs_conffile_list() {
find "${_CS_CONFFILE_ROOT:-/etc}" -maxdepth 6 \( -name '*.dpkg-dist' -o -name '*.dpkg-new' \) 2>/dev/null | sort
# 2>/dev/null hides find's message about an unreadable /etc/credstore, not its
# exit status, which pipefail then passes on as if sort had failed.
{ find "${_CS_CONFFILE_ROOT:-/etc}" -maxdepth 6 \( -name '*.dpkg-dist' -o -name '*.dpkg-new' \) 2>/dev/null || true; } | sort
}

apt_conffile_guard() {
Expand Down
3 changes: 2 additions & 1 deletion lib/runtime.func
Original file line number Diff line number Diff line change
Expand Up @@ -1954,7 +1954,8 @@ get_php_fpm_socket() {
echo "/run/php/php${PHP_VERSION}-fpm.sock"
return 0
fi
sock=$(find /run/php -maxdepth 1 -name "php*-fpm.sock" -type s 2>/dev/null | sort -V | tail -1)
# Unguarded, a missing /run/php aborts the caller before the message below.
sock=$({ find /run/php -maxdepth 1 -name "php*-fpm.sock" -type s 2>/dev/null || true; } | sort -V | tail -1)
if [[ -z "$sock" ]]; then
msg_error "No active PHP-FPM socket found under /run/php"
return 1
Expand Down
6 changes: 3 additions & 3 deletions pve/vm-app.func
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ list_available_apps() {
find /tmp/proxmoxved-repo/install -name '*-install.sh' -printf '%f\n' |
grep -vE "$exclude_pattern" |
sed 's/-install\.sh$//' |
sort
sort || true
return 0
fi

Expand All @@ -70,7 +70,7 @@ list_available_apps() {
grep -E '^[a-z0-9_-]+-install\.sh$' |
grep -vE "$exclude_pattern" |
sed 's/-install\.sh$//' |
sort
sort || true
return 0
fi

Expand All @@ -84,7 +84,7 @@ list_available_apps() {
grep -E '^[a-z0-9_-]+-install\.sh$' |
grep -vE "$exclude_pattern" |
sed 's/-install\.sh$//' |
sort
sort || true
return 0
fi

Expand Down
Loading