From 8f5c393b12f61cdfd6e18e9fce2bb58fcb41e261 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 22 Apr 2015 10:58:40 -0400
Subject: [PATCH] only exposing password at setup end if one is autogenerated

---
 src/install.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/install.js b/src/install.js
index 866fd1d567..e5226cb78e 100644
--- a/src/install.js
+++ b/src/install.js
@@ -335,7 +335,7 @@ function createAdmin(callback) {
 				}
 
 				Groups.join('administrators', uid, function(err) {
-					callback(err, results);
+					callback(err, password ? results : undefined);
 				});
 			});
 		},
@@ -362,7 +362,7 @@ function createAdmin(callback) {
 		prompt.get(questions, success);
 	} else {
 		// If automated setup did not provide a user password, generate one, it will be shown to the user upon setup completion
-		if (!install.values.hasOwnProperty('admin:password')) {
+		if (!install.values.hasOwnProperty('admin:password') && !nconf.get('admin:password')) {
 			process.stdout.write('Password was not provided during automated setup, generating one...\n')
 			password = utils.generateUUID().slice(0, 8);
 		}
@@ -370,8 +370,8 @@ function createAdmin(callback) {
 		var results = {
 			username: install.values['admin:username'] || 'admin',
 			email: install.values['admin:email'] || '',
-			password: install.values['admin:password'] || password,
-			'password:confirm': install.values['admin:password:confirm'] || password
+			password: install.values['admin:password'] || nconf.get('admin:password') || password,
+			'password:confirm': install.values['admin:password:confirm'] || nconf.get('admin:password') || password
 		};
 
 		success(null, results);