Fix ./nodebb upgrade process to not use programmatic npm

- Closes #3451
- Apparently, programmatically invoking npm is like opening Pandora's
box. No thanks.

nodebb

@@ -5,8 +5,7 @@ var colors = require('colors'),
 	argv = require('minimist')(process.argv.slice(2)),
 	fs = require('fs'),
 	async = require('async'),
-	touch = require('touch'),
+	touch = require('touch');
-	npm = require('npm');
 
 var getRunningPid = function(callback) {
 		fs.readFile(__dirname + '/pidfile', {
@@ -119,15 +118,12 @@ switch(process.argv[2]) {
 	case 'upgrade':
 		async.series([
 			function(next) {
-				process.stdout.write('1. '.bold + 'Bringing base dependencies up to date\n'.yellow);
+				process.stdout.write('1. '.bold + 'Bringing base dependencies up to date... '.yellow);
-				npm.load({
+				require('child_process').execFile('/usr/bin/env', ['npm', 'i', '--production'], next);
-					loglevel: 'silent'
-				}, function() {
-					npm.commands.install(next);
-				});
 			},
 			function(next) {
-				process.stdout.write('2. '.bold + 'Updating NodeBB data store schema\n'.yellow);
+				process.stdout.write('OK\n'.green);
+				process.stdout.write('2. '.bold + 'Updating NodeBB data store schema.\n'.yellow);
 				var upgradeProc = cproc.fork('app.js', ['--upgrade'], {
 					cwd: __dirname,
 					silent: false
@@ -136,7 +132,7 @@ switch(process.argv[2]) {
 				upgradeProc.on('close', next)
 			},
 			function(next) {
-				process.stdout.write('3. '.bold + 'Storing upgrade date in "package.json"\n'.yellow);
+				process.stdout.write('3. '.bold + 'Storing upgrade date in "package.json"... '.yellow);
 				touch(__dirname + '/package.json', {}, next);
 			}
 		], function(err) {
@@ -145,6 +141,8 @@ switch(process.argv[2]) {
 			} else {
 				var message = 'NodeBB Upgrade Complete!',
 					spaces = new Array(Math.floor(process.stdout.columns / 2) - (message.length / 2) + 1).join(' ');
+
+				process.stdout.write('OK\n'.green);
 				process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset);
 			}
 		});

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPL-3.0",
   "description": "NodeBB Forum",
-  "version": "0.7.3-dev",
+  "version": "0.7.3",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",

public/language/es/user.json

@@ -85,4 +85,4 @@
     "follow_topics_you_create": "Seguir publicaciones que creas",
     "grouptitle": "Selecciona el título del grupo que deseas visualizar",
     "no-group-title": "Sin título de grupo"
-}
+}

public/language/zh_CN/global.json

@@ -28,7 +28,7 @@
     "header.tags": "话题",
     "header.popular": "热门",
     "header.users": "会员",
-    "header.groups": "小组",
+    "header.groups": "群组",
     "header.chats": "聊天",
     "header.notifications": "通知",
     "header.search": "搜索",

public/language/zh_CN/user.json

@@ -25,7 +25,7 @@
     "watched": "已订阅",
     "followers": "粉丝",
     "following": "关注",
-    "aboutme": "About me",
+    "aboutme": "关于我",
     "signature": "签名档",
     "gravatar": "头像",
     "birthday": "生日",

src/topics/teaser.js

@@ -118,4 +118,4 @@ module.exports = function(Topics) {
 			Topics.setTopicField(tid, 'teaserPid', pid, callback);
 		});
 	};
-};
+};