- PASSWD1=$(dialog --stdout --title "$PN" --passwordbox "Set password (hidden typing):" 0 0)
- PASSWD2=$(dialog --stdout --title "$PN" --passwordbox "Retype new password:" 0 0)
+ if [ "${GUI}" = true ] ; then
+ PASSWD1="$($PWD_CMD --text="$PWD_TEXT1")"
+ PASSWD2="$($PWD_CMD --text="$PWD_TEXT2")"
+ else
+ PASSWD1="$($PWD_CMD "$PWD_TEXT1" 0 0)"
+ PASSWD2="$($PWD_CMD "$PWD_TEXT2" 0 0)"
+ fi
+
+ if [ -z "$PASSWD1" ] ; then
+ if [ -n "${GUI}" ] ; then
+ $DIALOG --title "$PN" --error --text "Error retrieving password. Exiting."
+ else
+ $DIALOG --title "$PN" --msgbox "Error retrieving password. Exiting." 0 0
+ fi
+ exit 1
+ fi
+