git: 95f0da5be1e3 - main - bsdinstall: Only show menu if there are more items to be installed

[Glen Barber]

The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=95f0da5be1e3456c930f5f9538cbc099c65f2014

commit 95f0da5be1e3456c930f5f9538cbc099c65f2014
Author:     Renato Botelho <renato at netgate.com>
AuthorDate: 2021-07-22 20:02:34 +0000
Commit:     Glen Barber <gjb at FreeBSD.org>
CommitDate: 2021-07-22 20:02:34 +0000

    bsdinstall: Only show menu if there are more items to be installed
    
    MFC after:      3 days
    Obtained from:  Rubicon Communications, LLC ("Netgate")
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 usr.sbin/bsdinstall/scripts/auto | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index 68809a22671b..9f8946880f61 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -157,16 +157,18 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
 	DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
 	DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')"
 
-	exec 3>&1
-	EXTRA_DISTS=$( eval dialog \
-	    --backtitle \"FreeBSD Installer\" \
-	    --title \"Distribution Select\" --nocancel --separate-output \
-	    --checklist \"Choose optional system components to install:\" \
-	    0 0 0 $DISTMENU \
-	2>&1 1>&3 )
-	for dist in $EXTRA_DISTS; do
-		export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
-	done
+	if [ -n "$DISTMENU" ]; then
+		exec 3>&1
+		EXTRA_DISTS=$( eval dialog \
+		    --backtitle \"FreeBSD Installer\" \
+		    --title \"Distribution Select\" --nocancel --separate-output \
+		    --checklist \"Choose optional system components to install:\" \
+		    0 0 0 $DISTMENU \
+		2>&1 1>&3 )
+		for dist in $EXTRA_DISTS; do
+			export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
+		done
+	fi
 fi
 
 FETCH_DISTRIBUTIONS=""