whiptail for passwords

Author: jvonau

iiab-upgrade

@@ -149,10 +149,13 @@ fi
 
 # B. Ask for password change if pi/raspberry default remains
 if check_user_pwd "pi" "raspberry"; then
-    echo -e "\n\nRaspberry Pi's are COMPROMISED often if the default password is not changed!\n"
-    echo -n "What password do you want for GNU/Linux user 'pi' ? "
-    read -t 5 ans < /dev/tty    # Whines but doesn't change password if [Enter]
-    echo pi:"$ans" | chpasswd || true    # Overrides 'set -e'
+    if [ $INTERACTIVE == 1 ]; then
+        PASSWORD=$(whiptail --passwordbox "
+Raspberry Pi's are COMPROMISED often if the default password is not changed!
+What password do you want for GNU/Linux user 'pi' ?
+press [Enter] for no change " 12 78 --title "password dialog" 3>&1 1>&2 2>&3)
+        echo pi:$PASSWORD | chpasswd 2>&1 > /dev/null || true    # Overrides 'set -e'
+    fi
 fi
 
 # C. Create user 'iiab-admin' as nec, with default password
@@ -163,14 +166,13 @@ fi
 
 # D. Ask for password change if iiab-admin/g0adm1n default remains
 if check_user_pwd "iiab-admin" "g0adm1n"; then
-    echo -e "\n\nUser 'iiab-admin' retains default password 'g0adm1n' per http://FAQ.IIAB.IO\n"
-
-    echo -e "This is for login to Internet-in-a-Box's Admin Console (http://box.lan/admin)\n"
     if [ $INTERACTIVE == 1 ]; then
-        echo -n "What password do you want for GNU/Linux user 'iiab-admin' ? "
-        echo -n "press [Enter] for no change"
-        read -t 15 ans < /dev/tty    # Whines but doesn't change password if [Enter]
-        echo iiab-admin:"$ans" | chpasswd || true    # Overrides 'set -e'
+        PASSWORD2=$(whiptail --passwordbox "
+User 'iiab-admin' retains default password 'g0adm1n' per http://FAQ.IIAB.IO
+This is for login to Internet-in-a-Box's Admin Console (http://box.lan/admin)
+What password do you want for GNU/Linux user 'iiab-admin' ?
+press [Enter] for no change " 12 78 --title "password dialog" 3>&1 1>&2 2>&3)
+        echo iiab-admin:$PASSWORD2 | chpasswd 2>&1 > /dev/null || true    # Overrides 'set -e'
     fi
 fi