Fix crash on open. (See #3.)

Author: mbostock

bin/gistup

@@ -67,15 +67,12 @@ var argv = optimist.usage("Usage: \033[1mgistup\033[0m [options] -- [file …]"
     })
     .argv;
 
-var open = process.platform === "linux" ? "xdg-open" : "open";
-
 queue(1)
     .defer(getSettings)
     .defer(gitInit)
     .defer(gitRemoteDoesNotExist)
     .defer(gitListUntrackedFiles)
     .await(function(error, settings, _, _, files) {
-      if (!error && settings.open === false) argv.open = false;
       unless(error)
           .defer(confirmFiles, files)
           .defer(gitAdd, files)
@@ -85,7 +82,7 @@ queue(1)
             unless(error)
                 .defer(gitRemoteAdd, id)
                 .defer(gitPush)
-                .defer(openBrowser, id)
+                .defer(openBrowser, argv.open && settings.open, id)
                 .await(unless);
           });
     });
@@ -191,8 +188,8 @@ function gitPush(callback) {
   });
 }
 
-function openBrowser(id, callback) {
-  if (!argv.open) return void callback(null);
+function openBrowser(open, id, callback) {
+  if (!open) return void callback(null);
   child.exec(open + " " + quote.single(argv.open) + id, function(error, stdout, stderr) {
     if (!error && stderr) process.stderr.write(stderr); // ignore errors
     callback(null);

lib/gistup/get-settings.js

@@ -3,6 +3,8 @@ var fs = require("fs"),
     child = require("child_process"),
     readline = require("readline");
 
+var open = process.platform === "linux" ? "xdg-open" : "open";
+
 module.exports = function(callback) {
   var home = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE,
       settingsPath = path.join(home, ".gistup.json"),
@@ -53,8 +55,7 @@ module.exports = function(callback) {
             readin.close();
             token = token.trim().toLowerCase();
             if (!/^[0-9a-f]{40}$/.test(token)) return void callback(new UserError("The access token \"" + token + "\" is invalid." + os.EOL + os.EOL + "Did you copy and paste the access token correctly? It should be a" + os.EOL + "forty-character hexadecimal string. Please fix and try again."));
-            settings = {token: token};
-            if (error) settings.open = false;
+            settings = {token: token, open: error ? null : open};
             fs.writeFile(settingsPath, JSON.stringify(settings, null, 2), {mode: parseInt("0600", 8)}, function(error) {
               callback(error, error ? null : settings);
             });
@@ -65,6 +66,7 @@ module.exports = function(callback) {
       return;
     }
 
+    if (!("open" in settings)) settings.open = open;
     callback(null, settings);
   });
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gistup",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Initialize a gist from the command-line.",
   "keywords": [
     "gist",