From f802d9c8eaaded1a867579e3b134794748932266 Mon Sep 17 00:00:00 2001
From: Rezart Qelibari <entwickler-kontakt@astzweig.de>
Date: Mon, 28 Feb 2022 08:26:06 +0200
Subject: [PATCH] Use default username/fullname hint only with value

---
 modules/02-create-filevault-user.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/02-create-filevault-user.sh b/modules/02-create-filevault-user.sh
index ab99414..5834b7c 100755
--- a/modules/02-create-filevault-user.sh
+++ b/modules/02-create-filevault-user.sh
@@ -148,9 +148,12 @@ function getQuestions() {
   local defaultUsername="`getDefaultUsername`" defaultFullname="`getDefaultFullname`"
   getUsersWithSecureToken
   getDefaultUserPictures
+  local defaultUsernameHint= defaultFullnameHint=
+  [ -n "${defaultUsername}" ] && defaultUsernameHint="default:${defaultUsername};"
+  [ -n "${defaultFullname}" ] && defaultFullnameHint="default:${defaultFullname};"
   questions=(
-    'i: filevault-fullname=What shall the FileVault user'\''s full name be? # default:'"${defaultFullname};"
-    'i: filevault-username=What shall the FileVault user'\''s username be? # default:'"${defaultUsername};"
+    'i: filevault-fullname=What shall the FileVault user'\''s full name be? # '"${defaultFullnameHint}"
+    'i: filevault-username=What shall the FileVault user'\''s username be? # '"${defaultUsernameHint}"
     'p: filevault-password=What shall the FileVault user'\''s password be?'
     's: filevault-picture=Select a picture for FileVault user or enter the path to your own picture # validator:isPathToPicture;choose from:'"${(j.,.)defaultUserPictures};"
     's: secure-token-user-username=Which user with a secure token shall be used? # choose from:'"${(j.,.)secureTokenUsers};"