nexus/ProxmoxVE
2
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-05-13 12:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools.func: fix php "wait_for" hint (#11254)

Browse Source
This commit is contained in:
CanbiZ (MickLesk)
2026-01-28 11:09:30 +01:00
committed by GitHub
parent 3042162065
commit 533ca924c9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/tools.func
+4 -2
View File
@@ -574,7 +574,8 @@ EOF
msg_error "Failed to download PHP keyring" msg_error "Failed to download PHP keyring"
return 1 return 1
} }
dpkg -i /tmp/debsuryorg-archive-keyring.deb >/dev/null 2>&1 || { # Don't use /dev/null redirection for dpkg as it may use background processes
dpkg -i /tmp/debsuryorg-archive-keyring.deb >>"$(get_active_logfile)" 2>&1 || {
msg_error "Failed to install PHP keyring" msg_error "Failed to install PHP keyring"
rm -f /tmp/debsuryorg-archive-keyring.deb rm -f /tmp/debsuryorg-archive-keyring.deb
return 1 return 1
@@ -4528,7 +4529,8 @@ EOF
# Ubuntu: Use ondrej/php PPA # Ubuntu: Use ondrej/php PPA
msg_info "Adding ondrej/php PPA for Ubuntu" msg_info "Adding ondrej/php PPA for Ubuntu"
$STD apt install -y software-properties-common $STD apt install -y software-properties-common
$STD add-apt-repository -y ppa:ondrej/php # Don't use $STD for add-apt-repository as it uses background processes
add-apt-repository -y ppa:ondrej/php >>"$(get_active_logfile)" 2>&1
else else
# Debian: Use Sury repository # Debian: Use Sury repository
manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || { manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || {