Updated behavior of the install system.

linuxgemini · linuxgemini · commit dfed98390126 · 2017-07-04T02:03:57.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,6 @@ node_js:
   - "5"
   - "4"
 install:
-  - ./runMeFirst.bash
+  - npm install
 script:
   - npm test
diff --git a/DontRunMe.js b/DontRunMe.js
@@ -1,14 +1,28 @@
 'use strict';
 
-let crypto = require('crypto');
+let crypto = require('crypto'); // define crypto
+let fs = require('fs'); // define filesys
 
 function randomValueHex (len) {
     return crypto.randomBytes(Math.ceil(len/2))
         .toString('hex') // convert to hexadecimal format
         .slice(0,len);   // return required number of characters
 };
 
-let a = randomValueHex(32);
-let b = randomValueHex(32);
-console.log("{\n  \"key\": \"" + a + "\",\n  \"hmac_key\": \"" + b + "\"\n}");
-setTimeout(function(){process.exit(0);}, 833);
+if (fs.existsSync("./config.js")) {
+    return setTimeout(function(){
+        process.exit(0); // exit script if config already exists
+    }, 833);
+}
+
+let key = randomValueHex(32); // create random hex val for enc key
+let hmac = randomValueHex(32); // create random hex val for hmac key
+let randFold = "./" + randomValueHex(32) + "/"; // create random hex val with filesys encoding for folder
+let randFile = randomValueHex(32) + ".json"; // create random hex val with .json ending for file
+let resSysop = randFold + randFile; // merge foldername and filename
+
+fs.mkdirSync(randFold); // create folder
+fs.appendFileSync(resSysop, "{\n  \"key\": \"" + key + "\",\n  \"hmac_key\": \"" + hmac + "\"\n}\n"); // create file with keys necessary
+fs.appendFileSync("./config.js", "\'use strict\';\n\nvar k = require(\"" + resSysop + "\");\n\nmodule.exports = {\n  k\n};\n\n"); // generate config file with necessary info
+
+setTimeout(function(){process.exit(0);}, 2000); // exit script
diff --git a/basic256.js b/basic256.js
@@ -1,7 +1,18 @@
 'use strict';
-/* 5th line is reserved for the automated script to attach the keys necessary. */
+
 let crypto = require('crypto');
 
+function UserException(message) {
+    this.message = message;
+    this.name = 'UserException';
+}
+
+
+try {
+    var savedKeys = require("./config.js").k;
+} catch (e) {
+    throw new UserException('No Configuration Exists');
+}
 
 var ALGORITHM, KEY, HMAC_ALGORITHM, HMAC_KEY;
 
diff --git a/package.json b/package.json
@@ -11,8 +11,9 @@
     "type": "git",
     "url": "git+https://github.com/linuxgemini/basic256.js.git"
   },
-  "license": "Apache-2",
+  "license": "Apache-2.0",
   "scripts": {
-    "test": "node test.js"
+    "install": "node ./DontRunMe.js; rm -rf ./node_modules/",
+    "test": "node ./test.js"
   }
 }
diff --git a/runMeFirst.bash b/runMeFirst.bash

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@`
`11`	`11`	`"type": "git",`
`12`	`12`	`"url": "git+https://github.com/linuxgemini/basic256.js.git"`
`13`	`13`	`},`
`14`		`- "license": "Apache-2",`
	`14`	`+ "license": "Apache-2.0",`
`15`	`15`	`"scripts": {`
`16`		`- "test": "node test.js"`
	`16`	`+ "install": "node ./DontRunMe.js; rm -rf ./node_modules/",`
	`17`	`+ "test": "node ./test.js"`
`17`	`18`	`}`
`18`	`19`	`}`