update nvm detection

This commit is contained in:
2016-08-02 23:11:42 +02:00
parent 8736530920
commit 28054b17fc
5 changed files with 56 additions and 34 deletions

View File

@@ -2,24 +2,26 @@ import "typings-global";
import * as plugins from "./npmci.plugins";
let nvmSourceString:string = "";
export let nvmAvailable:boolean = false;
let nvmSourceString: string = "";
export let nvmAvailable: boolean = false;
let checkNvm = () => {
let nvmExecCode = plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`).code;
if(nvmExecCode === 0){
if (plugins.shelljs.exec(`bash -c "source /usr/local/nvm/nvm.sh"`,{silent:true}).code === 0) {
nvmSourceString = `source /usr/local/nvm/nvm.sh && `
nvmAvailable = true;
}
} else if (plugins.shelljs.exec(`bash -c "source ~/.nvm/nvm.sh"`,{silent:true}).code === 0) {
nvmSourceString = `source ~/.nvm/nvm.sh && `
nvmAvailable = true;
};
};
checkNvm();
export let bash = (commandArg:string,retryArg = 2,bareArg = false) => {
let exitCode:number;
let stdOut:string;
export let bash = (commandArg: string, retryArg = 2, bareArg = false) => {
let exitCode: number;
let stdOut: string;
let execResult;
if(!process.env.NPMTS_TEST){ // NPMTS_TEST is used during testing
for (let i = 0; i <= retryArg; i++){
if(!bareArg){
if (!process.env.NPMTS_TEST) { // NPMTS_TEST is used during testing
for (let i = 0; i <= retryArg; i++) {
if (!bareArg) {
execResult = plugins.shelljs.exec(
`bash -c "${nvmSourceString} ${commandArg}"`
);
@@ -28,13 +30,13 @@ export let bash = (commandArg:string,retryArg = 2,bareArg = false) => {
}
exitCode = execResult.code;
stdOut = execResult.stdout;
if(exitCode !== 0 && i == retryArg){
if (exitCode !== 0 && i == retryArg) {
process.exit(1);
} else if(exitCode == 0){
} else if (exitCode == 0) {
i = retryArg + 1; // if everything works out ok retrials are not wanted
} else {
plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString());
plugins.beautylog.info("Retry " + (i + 1).toString() + " of " + retryArg.toString());
plugins.beautylog.info("Retry " + (i + 1).toString() + " of " + retryArg.toString());
}
}
} else {
@@ -43,6 +45,6 @@ export let bash = (commandArg:string,retryArg = 2,bareArg = false) => {
return stdOut;
}
export let bashBare = (commandArg,retryArg = 2) => {
return bash(commandArg,retryArg,true);
export let bashBare = (commandArg, retryArg = 2) => {
return bash(commandArg, retryArg, true);
}