From 40c2b2c386dbe411c61275a07e18596e076ff218 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Sun, 23 Oct 2016 14:54:57 +0200
Subject: [PATCH] fix bugs, prepare for rc

---
 README.md                      |  2 +-
 installer/bin/update-images.sh |  2 --
 installer/etc/issue            |  2 +-
 installer/install.sh           | 18 +++++++++++++-----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 6b9824ce..c3be25c0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?maxAge=2592000)](https://gitter.im/dtag-dev-sec/tpotce)
 
-# T-Pot 16.10 Image Creator (beta)
+# T-Pot 16.10 Image Creator
 
 This repository contains the necessary files to create the **[T-Pot community honeypot](http://dtag-dev-sec.github.io/)**  ISO image.
 The image can then be used to install T-Pot on a physical or virtual machine.
diff --git a/installer/bin/update-images.sh b/installer/bin/update-images.sh
index b41e69c3..2aa1b8dc 100755
--- a/installer/bin/update-images.sh
+++ b/installer/bin/update-images.sh
@@ -7,8 +7,6 @@
 # v16.10.0 by mo, DTAG, 2016-05-12                     #
 ########################################################
 
-echo "### I still need some dev-work!"
-
 # Make sure not to interrupt a check
 while true
 do
diff --git a/installer/etc/issue b/installer/etc/issue
index 685c4e4d..e4430fc8 100644
--- a/installer/etc/issue
+++ b/installer/etc/issue
@@ -1,4 +1,4 @@
-T-Pot 16.10 (beta)
+T-Pot 16.10
 Hostname: \n
 
 ___________     _____________________________
diff --git a/installer/install.sh b/installer/install.sh
index 590e7fcb..8697dc86 100755
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -53,7 +53,6 @@ fuECHO "### Waiting a few seconds to avoid interference with service messages."
 sleep 5
 
 # Let's ask user for a web user and password
-clear
 myOK="n"
 myUSER="tsec"
 while [ 1 != 2 ]
@@ -62,19 +61,28 @@ while [ 1 != 2 ]
     read -p "Username (tsec not allowed): " myUSER
     echo "Your username is: "$myUSER
     read -p "OK (y/n)? " myOK
-    if [ "$myOK" = "y" ] && [ "$myUSER" != "tsec" ];
+    if [ "$myOK" = "y" ] && [ "$myUSER" != "tsec" ] && [ "$myUSER" != "" ];
       then
         break
     fi
   done
 myPASS1="pass1"
 myPASS2="pass2"
-while [ "$myPASS1" != "$myPASS2"  ]
+while [ "$myPASS1" != "$myPASS2"  ] 
   do
-    read -s -p "Password: " myPASS1
-    echo
+    while [ "$myPASS1" == "pass1"  ] || [ "$myPASS1" == "" ]
+      do
+        read -s -p "Password: " myPASS1
+        echo
+      done
     read -s -p "Repeat password: " myPASS2
     echo
+    if [ "$myPASS1" != "$myPASS2" ];
+      then
+        fuECHO "### Passwords do not match."
+        myPASS1="pass1"
+        myPASS2="pass2"
+    fi
   done
 htpasswd -b -c /etc/nginx/nginxpasswd $myUSER $myPASS1