From cca4357c42db79009c533f3f65cb344030fc2422 Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Tue, 18 May 2021 14:01:00 +0200 Subject: [PATCH] fix nono check (#1965) * fix nono check * put the text in lib instead --- apps/talk.sh | 8 ++++---- lib.sh | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/talk.sh b/apps/talk.sh index 93a4532a..44721c92 100644 --- a/apps/talk.sh +++ b/apps/talk.sh @@ -83,15 +83,15 @@ lowest_compatible_nc 19 # Check if Nextcloud is installed with TLS check_nextcloud_https "Nextclod Talk" -while : -do - # Let the user choose port. TURN_PORT in msg_box is taken from lib.sh and later changed if user decides to. - msg_box "The default port for Talk used in this script is port $TURN_PORT. +# Let the user choose port. TURN_PORT in msg_box is taken from lib.sh and later changed if user decides to. +msg_box "The default port for Talk used in this script is port $TURN_PORT. You can read more about that port here: https://www.speedguide.net/port.php?port=$TURN_PORT You will now be given the option to change this port to something of your own. Please keep in mind NOT to use the following ports as they are likely in use already: ${NONO_PORTS[*]}" +while : +do if yesno_box_no "Do you want to change port?" then # Ask for port diff --git a/lib.sh b/lib.sh index 9f999768..e4055381 100644 --- a/lib.sh +++ b/lib.sh @@ -1674,7 +1674,9 @@ test_nono_ports() { check_nono_ports() { if test_nono_ports "${1}" "${NONO_PORTS[@]}" then - msg_box "You have to choose another port than $1. Please start over." + msg_box "You have to choose another port than $1. Please start over.\n +Please keep in mind NOT to use the following ports as they are likely in use already: +${NONO_PORTS[*]}" return 1 fi }