updated some style stuff

This commit is contained in:
AJ ONeal 2014-06-17 20:07:25 -06:00
parent 6f0833e1f4
commit 3cad559617
1 changed files with 14 additions and 9 deletions

View File

@ -7,6 +7,8 @@ var fs = require('fs')
, request = require('request') , request = require('request')
, CERTDB_URL = 'https://mxr.mozilla.org/nss/source/lib/ckfw/builtins/certdata.txt?raw=1' , CERTDB_URL = 'https://mxr.mozilla.org/nss/source/lib/ckfw/builtins/certdata.txt?raw=1'
, HEADER , HEADER
, outputFile
, outputPemsDir
; ;
HEADER = HEADER =
@ -153,18 +155,18 @@ function dumpCerts(certs, filename, pemsDir) {
} }
if (process.argv[2] == null) { if (process.argv[2] == null) {
console.error("Error: No file specified"); console.error("Error: No file specified");
console.info("Usage: %s <outputfile>", process.argv[1]); console.info("Usage: %s <outputfile>", process.argv[1]);
console.info(" where <outputfile> is the name of the file to write to, relative to %s", process.argv[1]); console.info(" where <outputfile> is the name of the file to write to, relative to %s", process.argv[1]);
console.info("Note that a 'pems/' directory will also be created at the same location as the <outputfile>, containing individual .pem files."); console.info("Note that a 'pems/' directory will also be created at the same location as the <outputfile>, containing individual .pem files.");
process.exit(3); process.exit(3);
} }
// main (combined) output file location, relative to this script's location // main (combined) output file location, relative to this script's location
var outputFile = path.resolve(__dirname, process.argv[2]); outputFile = path.resolve(__dirname, process.argv[2]);
// pems/ output directory, in the same directory as the outputFile // pems/ output directory, in the same directory as the outputFile
var outputPemsDir = path.resolve(outputFile, '../pems') outputPemsDir = path.resolve(outputFile, '../pems');
console.info("Loading latest certificates from " + CERTDB_URL); console.info("Loading latest certificates from " + CERTDB_URL);
@ -179,6 +181,9 @@ request(CERTDB_URL, function (error, response, body) {
process.exit(2); process.exit(2);
} }
var lines = body.split("\n"); var lines = body.split("\n")
dumpCerts(parseCertData(lines), outputFile, outputPemsDir); , certs = parseCertData(lines)
;
dumpCerts(certs, outputFile, outputPemsDir);
}); });