prioritize config file over env vars

fixes #15

Author: andrewrk

cli.js

@@ -52,29 +52,31 @@ var s3UrlRe = /^[sS]3:\/\/(.*?)\/(.*)/;
 barfOnUnexpectedArgs();
 
 var client;
-if (process.env.AWS_SECRET_KEY && process.env.AWS_ACCESS_KEY) {
-  setup(process.env.AWS_SECRET_KEY, process.env.AWS_ACCESS_KEY);
-} else {
-  fs.readFile(args.config, {encoding: 'utf8'}, function(err, contents) {
-    if (err) {
+
+fs.readFile(args.config, {encoding: 'utf8'}, function(err, contents) {
+  if (err) {
+    if (process.env.AWS_SECRET_KEY && process.env.AWS_ACCESS_KEY) {
+      setup(process.env.AWS_SECRET_KEY, process.env.AWS_ACCESS_KEY);
+    } else {
       console.error("This utility needs a config file formatted the same as for s3cmd");
+      console.error("or AWS_SECRET_KEY and AWS_ACCESS_KEY environment variables.");
       process.exit(1);
-      return;
-    }
-    var config = ini.parse(contents);
-    var accessKeyId, secretAccessKey;
-    if (config && config.default) {
-      accessKeyId = config.default.access_key;
-      secretAccessKey = config.default.secret_key;
-    }
-    if (!secretAccessKey || !accessKeyId) {
-      console.error("Config file missing access_key or secret_key");
-      process.exit(1);
-      return;
     }
-    setup(secretAccessKey, accessKeyId);
-  });
-}
+    return;
+  }
+  var config = ini.parse(contents);
+  var accessKeyId, secretAccessKey;
+  if (config && config.default) {
+    accessKeyId = config.default.access_key;
+    secretAccessKey = config.default.secret_key;
+  }
+  if (!secretAccessKey || !accessKeyId) {
+    console.error("Config file missing access_key or secret_key");
+    process.exit(1);
+    return;
+  }
+  setup(secretAccessKey, accessKeyId);
+});
 
 function setup(secretAccessKey, accessKeyId) {
   var maxSockets = parseInt(args['max-sockets'], 10);