From 8e1f53f34e4edf2c3ef88f64447765c61674bf0c Mon Sep 17 00:00:00 2001 From: Orazio Date: Mon, 8 Jun 2020 09:38:53 +0200 Subject: [PATCH] Updated askAboutCustomizing() function - Tweaked dialog text - Don't show dialog if runnning unattended --- auto_install/install.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 68a920d..b73f7ed 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -1124,10 +1124,12 @@ askWhichVPN(){ } askAboutCustomizing(){ - if (whiptail --backtitle "Setup PiVPN" --title "Installation mode" --yesno --defaultno "PiVPN uses some settings that we believe are good defaults for most users.\n\n- UDP or TCP protocol: UDP\n- Custom search domain for the DNS field: None\n- Modern features or best compatibility: Modern features (256 bit certificate + additional TLS encryption)\n\nHowever, we still want to keep flexibility, so if you need to customize them, choose Yes." ${r} ${c}); then - CUSTOMIZE=1 - else - CUSTOMIZE=0 + if [ "${runUnattended}" = 'false' ]; then + if (whiptail --backtitle "Setup PiVPN" --title "Installation mode" --yesno --defaultno "PiVPN uses the following settings that we believe are good defaults for most users. However, we still want to keep flexibility, so if you need to customize them, choose Yes.\n\n* UDP or TCP protocol: UDP\n* Custom search domain for the DNS field: None\n* Modern features or best compatibility: Modern features (256 bit certificate + additional TLS encryption)" ${r} ${c}); then + CUSTOMIZE=1 + else + CUSTOMIZE=0 + fi fi }