From 0076aca02b8e0ba4e2c6f33d025dd4a2377a7523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 1 Jan 2021 12:42:29 +0100
Subject: [PATCH] installer.sh.in: add " again" just once
Closes: #170
---
installer.sh.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/installer.sh.in b/installer.sh.in
index b76680c..2c5a3d0 100644
--- a/installer.sh.in
+++ b/installer.sh.in
@@ -627,15 +627,15 @@ set_hostname() {
}
menu_rootpassword() {
- local _firstpass _secondpass _desc
+ local _firstpass _secondpass _again _desc
while true; do
if [ -z "${_firstpass}" ]; then
_desc="Enter the root password"
else
- _desc="$_desc again"
+ _again=" again"
fi
- DIALOG --insecure --passwordbox "${_desc}" ${INPUTSIZE}
+ DIALOG --insecure --passwordbox "${_desc}${_again}" ${INPUTSIZE}
if [ $? -eq 0 ]; then
if [ -z "${_firstpass}" ]; then
_firstpass="$(cat $ANSWER)"
@@ -663,7 +663,7 @@ set_rootpassword() {
}
menu_useraccount() {
- local _firstpass _secondpass _desc
+ local _firstpass _secondpass _desc _again
local _groups _status _group _checklist
local _preset
@@ -698,9 +698,9 @@ menu_useraccount() {
if [ -z "${_firstpass}" ]; then
_desc="Enter the password for login '$(get_option USERLOGIN)'"
else
- _desc="$_desc again"
+ _again=" again"
fi
- DIALOG --insecure --passwordbox "${_desc}" ${INPUTSIZE}
+ DIALOG --insecure --passwordbox "${_desc}${_again}" ${INPUTSIZE}
if [ $? -eq 0 ]; then
if [ -z "${_firstpass}" ]; then
_firstpass="$(cat $ANSWER)"