From 4de3d24faded0d36665920f3c34c0020800aef9b Mon Sep 17 00:00:00 2001
From: Dan Walters <dan@walters.io>
Date: Mon, 8 Dec 2014 09:13:13 -0600
Subject: [PATCH] Simplify, just load configuration from a config.json.

---
 .gitignore              |  2 ++
 cli.js                  |  5 +++--
 config.js               | 17 -----------------
 tools/decode_capture.js |  2 +-
 4 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 config.js

diff --git a/.gitignore b/.gitignore
index 3c3629e..a4e6641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+.DS_Store
 node_modules
+config.json
diff --git a/cli.js b/cli.js
index b71489e..241df45 100644
--- a/cli.js
+++ b/cli.js
@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 var Lock = require('./lib/lock');
 var noble = require('noble');
 
@@ -7,7 +9,6 @@ var argv = require('yargs')
   .usage('Control an August Smart Lock.\nUsage: $0 [command]')
   .example('$0 lock', 'closes the lock')
   .example('$0 unlock', 'opens the lock')
-  .describe('config', 'configuration file (default is $HOME/.config/augustctl.json)')
   .check(function(argv) {
     if (argv._.length !== 1) {
       return 'must specify an operation to perform';
@@ -20,7 +21,7 @@ var argv = require('yargs')
   })
   .argv;
 
-var config = require('./config')(argv.config);
+var config = require(process.env.AUGUSTCTL_CONFIG || './config.json');
 
 noble.on('stateChange', function(state) {
   if (state === 'poweredOn') {
diff --git a/config.js b/config.js
deleted file mode 100644
index b47ba72..0000000
--- a/config.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var fs = require('fs');
-
-function loadConfig(filename) {
-  if (!filename) {
-    var configDir = process.env.XDG_CONFIG_HOME || (process.env.HOME + '/.config');
-    filename = configDir + '/augustctl.json';
-  }
-
-  var config = JSON.parse(fs.readFileSync(filename));
-  if (!config.offlineKey || !config.offlineKeyOffset) {
-    throw new Error("config file must specify offlineKey and offlineKeyOffset");
-  }
-
-  return config;
-}
-
-module.exports = loadConfig;
diff --git a/tools/decode_capture.js b/tools/decode_capture.js
index 150d20b..391e5da 100644
--- a/tools/decode_capture.js
+++ b/tools/decode_capture.js
@@ -73,5 +73,5 @@ function decodeLog(offlineKey, filename) {
   });
 }
 
-var config = require('../config')();
+var config = require(process.env.AUGUSTCTL_CONFIG || '../config.json');
 decodeLog(config.offlineKey, process.argv[2]);
-- 
GitLab