Skip to content
Snippets Groups Projects
Commit 4de3d24f authored by Dan Walters's avatar Dan Walters
Browse files

Simplify, just load configuration from a config.json.

parent 81a5facb
Branches
Tags
No related merge requests found
.DS_Store
node_modules
config.json
#!/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') {
......
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;
......@@ -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]);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment