From f5f84d9946ae19345be6f9d9088501a95d348132 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 3 Oct 2014 15:28:02 -0400
Subject: [PATCH] fixing upgrade text to use nodebb executable, removed
 exposure of option to run without upgrading

---
 app.js | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/app.js b/app.js
index c0822a6edc..052ddb595d 100644
--- a/app.js
+++ b/app.js
@@ -73,7 +73,7 @@ if (nconf.get('config')) {
 }
 configExists = fs.existsSync(configFile);
 
-if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
+if (!nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && !nconf.get('reset') && configExists) {
 	start();
 } else if (nconf.get('setup') || nconf.get('install') || !configExists) {
 	setup();
@@ -81,8 +81,6 @@ if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf
 	upgrade();
 } else if (nconf.get('reset')) {
 	reset();
-} else {
-	displayHelp();
 }
 
 function loadConfig() {
@@ -167,7 +165,7 @@ function start() {
 							case 'css-propagate':
 								meta.css.cache = message.cache;
 								meta.css.acpCache = message.acpCache;
-								winston.info('[cluster] Stylesheet propagated to worker ' + cluster.worker.id);
+								winston.info('[cluster] Stylesheets propagated to worker ' + cluster.worker.id);
 							break;
 						}
 					});
@@ -181,10 +179,12 @@ function start() {
 					});
 				} else {
 					winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:');
-					winston.warn('    node app --upgrade');
-					winston.warn('To ignore this error (not recommended):');
-					winston.warn('    node app --no-check-schema');
-					process.exit();
+					winston.warn('    ./nodebb upgrade');
+					if (cluster.isWorker) {
+						cluster.worker.kill();
+					} else {
+						process.exit();
+					}
 				}
 			});
 		});
@@ -355,16 +355,4 @@ function restart() {
 		winston.error('[app] Could not restart server. Shutting down.');
 		shutdown(1);
 	}
-}
-
-function displayHelp() {
-	winston.info('Usage: node app [options] [arguments]');
-	winston.info('       [NODE_ENV=development | NODE_ENV=production] node app [--start] [arguments]');
-	winston.info('');
-	winston.info('Options:');
-	winston.info('  --help              displays this usage information');
-	winston.info('  --setup             configure your environment and setup NodeBB');
-	winston.info('  --upgrade           upgrade NodeBB, first read: https://docs.nodebb.org/en/latest/upgrading/');
-	winston.info('  --reset             soft resets NodeBB; disables all plugins and restores selected theme to Vanilla');
-	winston.info('  --start             manually start NodeBB (default when no options are given)');
-}
+}
\ No newline at end of file