From 20b16e5301d933f449ddc57c66df2ff5958de6ea Mon Sep 17 00:00:00 2001 From: Aaron Schrab Date: Wed, 20 Feb 2013 13:02:36 -0500 Subject: [PATCH 1/3] Fix capitalization of sandboxCommands file On case-sensitive file systems, need to use correct case in require() calls. --- src/js/level/parseWaterfall.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/level/parseWaterfall.js b/src/js/level/parseWaterfall.js index a3f710c3..0e23f7d4 100644 --- a/src/js/level/parseWaterfall.js +++ b/src/js/level/parseWaterfall.js @@ -1,7 +1,7 @@ var _ = require('underscore'); var GitCommands = require('../git/commands'); -var SandboxCommands = require('../level/SandboxCommands'); +var SandboxCommands = require('../level/sandboxCommands'); // more or less a static class var ParseWaterfall = function(options) { From 15f7d0f663895339d5c14a7e8ac90267cf24a114 Mon Sep 17 00:00:00 2001 From: Aaron Schrab Date: Wed, 20 Feb 2013 13:01:54 -0500 Subject: [PATCH 2/3] Fix path to levels from level arbiter Need to go up to directories from the level arbiter to get to the directory containing level definitions. --- src/js/level/arbiter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/level/arbiter.js b/src/js/level/arbiter.js index ed1fce0f..28038e12 100644 --- a/src/js/level/arbiter.js +++ b/src/js/level/arbiter.js @@ -3,8 +3,8 @@ var Backbone = require('backbone'); // Each level is part of a "sequence;" levels within // a sequence proceed in order. -var levelSequences = require('../levels').levelSequences; -var sequenceInfo = require('../levels').sequenceInfo; +var levelSequences = require('../../levels').levelSequences; +var sequenceInfo = require('../../levels').sequenceInfo; var Main = require('../app'); From ac4e5c65c649e4a7b7d976336e788ba875947cb2 Mon Sep 17 00:00:00 2001 From: Aaron Schrab Date: Wed, 20 Feb 2013 13:06:32 -0500 Subject: [PATCH 3/3] Add levels symlink at top level Without this link running `grunt build` gives me errors like: Running "browserify:build/bundle.js" (browserify) task Fatal error: Cannot find module: "../../levels/intro/1" from directory "/home/ats/vc/learnGitBranching/src/levels" while processing file /home/ats/vc/learnGitBranching/src/levels/index.js --- levels | 1 + 1 file changed, 1 insertion(+) create mode 120000 levels diff --git a/levels b/levels new file mode 120000 index 00000000..9b9cdff0 --- /dev/null +++ b/levels @@ -0,0 +1 @@ +src/levels \ No newline at end of file