Index: scripts/start.sh
===================================================================
diff -u -r4717608b04a56847fcc274150078fccafa5a86d3 -re554eebb79659077383c506d90cecbc125855894
--- scripts/start.sh	(.../start.sh)	(revision 4717608b04a56847fcc274150078fccafa5a86d3)
+++ scripts/start.sh	(.../start.sh)	(revision e554eebb79659077383c506d90cecbc125855894)
@@ -237,7 +237,7 @@
 }
 
 function manufacturingModePrompt() {
-    if (( $MANUFACTURING_SETUP )); then : else return; fi
+    if (( $MANUFACTURING_SETUP )); then :; else return; fi
 
     echo_star_comment
     echo_star_message "Do you want to run in the Manufacturing Mode?"
@@ -248,8 +248,8 @@
         sshRun "echo $SETUP_ENABLE_MANUFACTURING_MODE > $SETUP_CONF_FILE"
         echo_star_message "Set the setup in manufacturing mode"
     else
-        sshRun "echo ''                               > $SETUP_CONF_FILE"
-        echo_star_message "Continuing the setup in normal mode"
+        echo_star_message "Abort the Manufacturing setup by user"
+        exit 0
     fi
 }
 
@@ -277,7 +277,7 @@
     if [ $? -eq 0 ]; then
       break
     else
-      read -p "Please enter the server Ip address: " -e -i "" -r SERVER_IP
+      read -p "Please enter the server Ip address : " -e -i "" -r SERVER_IP
       validIP "$SERVER_IP"
       if [ $? -eq 0 ]; then
         break
@@ -310,7 +310,7 @@
     if [ $? -eq 0 ]; then
       break
     else
-      read -p "Please enter the server Ip address: " -e -i "" -r SERVER_WS
+      read -p "Please enter the server environment: " -e -i "" -r SERVER_WS
       validWS "$SERVER_WS"
       if [ $? -eq 0 ]; then
         break