github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

standardize on '-' rather than '_' in filenames

Browse Source
This commit is contained in:
Geoff Schmidt
2013-12-30 18:41:35 -08:00
parent 4ce06b9a91
commit ddfbda7046
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/commands.js
View File

@@ -601,8 +601,8 @@ main.registerCommand({
if (options.args.length === 0) {
// localhost mode
var mongo_runner = require(path.join(__dirname, 'mongo_runner.js'));
var mongoPort = mongo_runner.findMongoPort(options.appDir);
var mongoRunner = require(path.join(__dirname, 'mongo-runner.js'));
var mongoPort = mongoRunner.findMongoPort(options.appDir);
if (! mongoPort) {
process.stdout.write(
"mongo: Meteor isn't running.\n" +
@@ -656,8 +656,8 @@ main.registerCommand({
return 1;
}
var mongo_runner = require(path.join(__dirname, 'mongo_runner.js'));
var isRunning = !! mongo_runner.findMongoPort(options.appDir);
var mongoRunner = require(path.join(__dirname, 'mongo-runner.js'));
var isRunning = !! mongoRunner.findMongoPort(options.appDir);
if (isRunning) {
process.stderr.write(
"reset: Meteor is running.\n" +

0
tools/meteor_npm.js → tools/meteor-npm.js
View File

0
tools/mongo_exit_codes.js → tools/mongo-exit-codes.js
View File

0
tools/mongo_runner.js → tools/mongo-runner.js
View File

2
tools/packages.js
View File

@@ -7,7 +7,7 @@ var bundler = require('./bundler.js');
var Builder = require('./builder.js');
var project = require('./project.js');
var buildmessage = require('./buildmessage.js');
var meteorNpm = require('./meteor_npm.js');
var meteorNpm = require('./meteor-npm.js');
var archinfo = require(path.join(__dirname, 'archinfo.js'));
var linker = require(path.join(__dirname, 'linker.js'));
var unipackage = require('./unipackage.js');

6
tools/run.js
View File

@@ -12,8 +12,8 @@ var updater = require('./updater.js');
var bundler = require('./bundler.js');
var Builder = require('./builder.js');
var buildmessage = require('./buildmessage.js');
var mongo_runner = require('./mongo_runner.js');
var mongoExitCodes = require('./mongo_exit_codes.js');
var mongoRunner = require('./mongo-runner.js');
var mongoExitCodes = require('./mongo-exit-codes.js');
var unipackage = require('./unipackage.js');
var release = require('./release.js');
@@ -604,7 +604,7 @@ exports.run = function (appDir, options) {
var mongoStartupPrintTimer;
var launch = function () {
Fiber(function () {
Status.mongoHandle = mongo_runner.launchMongo({
Status.mongoHandle = mongoRunner.launchMongo({
appDir: appDir,
port: mongoPort,
onListen: function () { // On Mongo startup complete

2
tools/tests/test_bundler.js
View File

@@ -27,7 +27,7 @@ var lastTmpDir;
Fiber(function () {
try {
// print calls to `npm`
require(path.join(__dirname, '..', 'meteor_npm.js'))._printNpmCalls = true;
require(path.join(__dirname, '..', 'meteor-npm.js'))._printNpmCalls = true;
/// RUN TESTS
require(path.join(__dirname, 'test_bundler_assets.js'));

2
tools/tests/test_bundler_npm.js
View File

@@ -1,4 +1,4 @@
var meteorNpm = require(path.join(__dirname, '..', 'meteor_npm.js'));
var meteorNpm = require(path.join(__dirname, '..', 'meteor-npm.js'));
///
/// TEST PACKAGE DIR