Merge pull request #17 from playground/build-cli

Build cli

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hzn-cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Open Horizon CLI toolkit helps streamline the process of preparing node agents and perform tasks between orgs environments",
   "main": "./build/index.js",
   "bin": {
@@ -37,6 +37,7 @@
     "chalk": "^4.1.2",
     "clear": "^0.1.0",
     "commander": "^8.2.0",
+    "dotenv": "^10.0.0",
     "figlet": "^1.5.2",
     "prompt": "^1.2.0",
     "rxjs": "^7.3.0",

src/common/src/env.ts

@@ -1,7 +1,8 @@
 import { Observable } from 'rxjs';
-import { readFileSync } from 'fs';
+import { readFileSync, existsSync } from 'fs';
 const cp = require('child_process'),
 exec = cp.exec;
+var dotenv = require('dotenv');
 
 const pEnv = process.env;
 
@@ -12,6 +13,12 @@ export class Env {
   hznEnv: any;
   configPath: string;
   constructor(env: string, configPath: string) {
+    if(existsSync(`${configPath}/.env-local`)) {
+      const localEnv = dotenv.parse(readFileSync(`${configPath}/.env-local`));
+      for(var i in localEnv) {
+        pEnv[i] = localEnv[i];
+      }
+    }
     this.env = env;
     this.configPath = configPath;
     this.hznEnv = `${configPath}/.env-hzn.json`;
@@ -22,8 +29,10 @@ export class Env {
       // console.log(process.cwd(), this.env, this.hznJson)
       this.envVars = this.hznJson[this.env]['envVars'];
       for(const [key, value] of Object.entries(this.envVars)) {
-        // @ts-ignore
-        pEnv[key] = value.replace(/\r?\n|\r/g, '');
+        if(!pEnv[key]) {
+          // @ts-ignore
+          pEnv[key] = value.replace(/\r?\n|\r/g, '');
+        } 
         // console.log(`${key}: ${pEnv[key]}`);
       }
       if(!this.envVars.ARCH || this.envVars.ARCH === undefined) {