fix exporting in the os x app while maintaining compatibility with th…

…e ubuntu node ppa
florianf · Aug 4, 2011 · 220470d · 220470d
1 parent 856f3e6
commit 220470d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -1,6 +1,11 @@
 #!/usr/bin/env node
 process.title = 'tilemill';
 
+// This is necessary to make optimist not special-case into coffeescript as
+// certain node installs (e.g. ubuntu node ppa) do not use `node` as the binary
+// name.
+process.argv[0] = 'node';
+
 require('tilelive-mapnik').registerProtocols(require('tilelive'));
 require('mbtiles').registerProtocols(require('tilelive'));
 

diff --git a/models/Exports.server.bones b/models/Exports.server.bones
@@ -15,10 +15,7 @@ var start = function(model, data, callback) {
         // nice the export process.
         args.push('-n19');
         // node command
-        // @TODO note that process.execPath is not used here as certain
-        // installs (e.g. ubuntu node ppa) do not use `node` as the binary
-        // name causing optimist arg parsing to fail.
-        args.push('node');
+        args.push(process.execPath);
         // tilemill index.js
         args.push(path.resolve(path.join(__dirname + '/../index.js')));
         // export command