mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-04-28 21:30:41 +00:00
Revert "Prefer silent mode on PHS env conflict (#13951)"
This reverts commit a37b36520c.
This commit is contained in:
committed by
GitHub
parent
aa54abcf50
commit
a0cca15960
+4
-8
@@ -3520,14 +3520,10 @@ msg_menu() {
|
|||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
resolve_phs_mode() {
|
resolve_phs_mode() {
|
||||||
if [[ -n "${PHS_SILENT+x}" ]] && [[ "${PHS_SILENT}" == "1" ]] && [[ -n "${PHS_VERBOSE+x}" ]] && [[ "${PHS_VERBOSE}" == "1" ]]; then
|
if [[ -n "${PHS_SILENT+x}" ]] && [[ "${PHS_SILENT}" == "1" ]] && [[ -n "${PHS_VERBOSE+x}" ]] && [[ "${PHS_VERBOSE}" == "1" ]]; then
|
||||||
# Conflict handling must never block unattended/non-TTY updates.
|
whiptail --backtitle "Proxmox VE Helper Scripts" \
|
||||||
# Prefer silent mode to keep automation safe.
|
--title "⚠️ Configuration Conflict Warning" \
|
||||||
if [[ -t 0 ]] && [[ -t 1 ]] && command -v whiptail >/dev/null 2>&1; then
|
--msgbox "PHS_SILENT and PHS_VERBOSE environment variables are both set.\n\nFalling back to interactive mode." 10 58
|
||||||
whiptail --backtitle "Proxmox VE Helper Scripts" \
|
PHS_MODE="interactive"
|
||||||
--title "Configuration Conflict Warning" \
|
|
||||||
--msgbox "PHS_SILENT and PHS_VERBOSE are both set.\n\nFalling back to silent mode." 10 58 || true
|
|
||||||
fi
|
|
||||||
PHS_MODE="silent"
|
|
||||||
elif [[ -n "${PHS_SILENT+x}" ]] && [[ "${PHS_SILENT}" == "1" ]]; then
|
elif [[ -n "${PHS_SILENT+x}" ]] && [[ "${PHS_SILENT}" == "1" ]]; then
|
||||||
PHS_MODE="silent"
|
PHS_MODE="silent"
|
||||||
elif [[ -n "${PHS_VERBOSE+x}" ]] && [[ "${PHS_VERBOSE}" == "1" ]]; then
|
elif [[ -n "${PHS_VERBOSE+x}" ]] && [[ "${PHS_VERBOSE}" == "1" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user