From 23e759fc839d9b7d3220ab3c27a1fd84554ec1cf Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 27 May 2013 16:17:19 -0400 Subject: [PATCH] some cleanup and fixing breaking bug introduced by merge --- app.js | 7 +++++-- src/feed.js | 9 +-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app.js b/app.js index 38bcdfd222..0cd752679b 100644 --- a/app.js +++ b/app.js @@ -18,6 +18,7 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) { global.config[c] = config[c]; } } + console.log(global.config); var categories = require('./src/categories.js'), templates = require('./public/src/templates.js'), @@ -82,8 +83,10 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) { process.stdout.write( "\nWelcome to NodeBB!\nThis looks like a new installation, so you'll have to answer a " + - "few questions about your environment before we can proceed with the setup.\n\n\nWhat is...\n\n" - ); + "few questions about your environment before we can proceed with the setup.\n\n" + + "Press enter to accept the default setting (shown in brackets).\n\n\n" + + "What is...\n\n" + ); ask('... the publically accessible URL of this installation? (http://localhost)', function(base_url) { ask('... the port number of your install? (4567)', function(port) { diff --git a/src/feed.js b/src/feed.js index 763b3855a7..ff3038bdc0 100644 --- a/src/feed.js +++ b/src/feed.js @@ -2,10 +2,7 @@ var RDB = require('./redis.js'), schema = require('./schema.js'), posts = require('./posts.js'), - topics = require('./topics.js'), - config = require('../config.js'); - - + topics = require('./topics.js'); function saveFeed(feed, xml) { feed.endEntry(); @@ -16,7 +13,6 @@ var ATOMWriter = require('atom-writer'), feed = new ATOMWriter(xml); - return feed .startFeed(urn) .writeStartIndex(1) @@ -74,10 +70,7 @@ }; - Feed.updateCategory = function(params) { }; - - }(exports)); \ No newline at end of file