2.0.16

npmextra.json

@@ -1,6 +1,7 @@
 {
   "npmci": {
     "npmGlobalTools": [],
-    "npmAccessLevel": "public"
+    "npmAccessLevel": "public",
+    "npmRegistryUrl": "registry.npmjs.org"
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pushrocks/smartshell",
   "private": false,
-  "version": "2.0.12",
+  "version": "2.0.16",
   "description": "shell actions designed as promises",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -24,16 +24,17 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartshell#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tsrun": "^1.1.13",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.12.10",
-    "tslint": "^5.11.0",
-    "tslint-config-prettier": "^1.16.0"
+    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsrun": "^1.2.6",
+    "@gitzone/tstest": "^1.0.20",
+    "@pushrocks/tapbundle": "^3.0.9",
+    "@types/node": "^12.0.2",
+    "tslint": "^5.16.0",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartexit": "^1.0.8",
+    "@pushrocks/smartpromise": "^3.0.2",
     "@types/which": "^1.3.1",
     "which": "^1.3.1"
   }

ts/smartshell.classes.shellenv.ts

@@ -73,22 +73,28 @@ export class ShellEnv {
     this.sourceFileArray = [];
   }
 
-  createEnvExecString(commandArg): string {
+  public createEnvExecString(commandArg: string): string {
     let commandResult = '';
     let sourceString = '';
 
+    // deal with sourcestring
+    for (const sourceFilePath of this.sourceFileArray) {
+      sourceString = sourceString + `source ${sourceFilePath} && `;
+    }
+
+    // deal with avaiable path
+    let pathString = 'PATH=$PATH';
+    for (const pathDir of this.pathDirArray) {
+      pathString += `:${pathDir}`;
+    }
+    pathString += ` && `;
+
     switch (this.executor) {
       case 'bash':
-        for (let sourceFilePath of this.sourceFileArray) {
-          sourceString = sourceString + `source ${sourceFilePath} && `;
-        }
-        commandResult = `bash -c '${sourceString}${commandArg}'`;
+        commandResult = `bash -c '${pathString}${sourceString}${commandArg}'`;
         break;
       case 'sh':
-        for (let sourceFilePath of this.sourceFileArray) {
-          sourceString = sourceString + `source ${sourceFilePath} && `;
-        }
-        commandResult = `${sourceString}${commandArg}`;
+        commandResult = `${pathString}${sourceString}${commandArg}`;
         break;
     }
     commandResult = this._setPath(commandResult);

ts/smartshell.classes.smartshell.ts

@@ -26,7 +26,8 @@ export interface IExecResultStreaming {
 
 // -- SmartShell --
 export class Smartshell {
-  shellEnv: ShellEnv;
+  public shellEnv: ShellEnv;
+  public smartexit = new plugins.smartexit.SmartExit();
 
   constructor(optionsArg: IShellEnvContructorOptions) {
     this.shellEnv = new ShellEnv(optionsArg);
@@ -55,6 +56,8 @@ export class Smartshell {
       detached: true
     });
 
+    this.smartexit.addProcess(execChildProcess);
+
     execChildProcess.stdout.on('data', data => {
       if (!silentArg) {
         spawnlogInstance.logToConsole(data);
@@ -80,6 +83,7 @@ export class Smartshell {
     }
 
     execChildProcess.on('exit', (code, signal) => {
+      this.smartexit.removeProcess(execChildProcess);
       if (strictArg && code === 1) {
         done.reject();
       }

ts/smartshell.plugins.ts

@@ -1,4 +1,5 @@
+import * as smartexit from '@pushrocks/smartexit';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as which from 'which';
 
-export { smartpromise, which };
+export { smartexit, smartpromise, which };