diff --git a/src/job.ts b/src/job.ts index 4cea81618..ceeb6f669 100644 --- a/src/job.ts +++ b/src/job.ts @@ -277,7 +277,7 @@ export class Job { cmd += `${script}\n`; }); const cp = childProcess.spawn(cmd, { - shell: Utils.getShell(), + shell: 'bash', stdio: ['inherit', 'inherit', 'inherit'], cwd: this.cwd, }); @@ -301,7 +301,7 @@ export class Job { process.stdout.write(`${this.getJobNameString()} ${magentaBright('pulled')} in ${magenta(prettyHrtime(endTime))}\n`); let dockerCmd = ``; - dockerCmd += `docker run -u 0:0 -d -i -w /builds/ ${this.image} `; + dockerCmd += `docker run -u 0:0 -d -i -w //builds/ ${this.image} `; dockerCmd += `sh -c "\n` dockerCmd += `if [ -x /usr/local/bin/bash ]; then\n` dockerCmd += `\texec /usr/local/bin/bash \n`; @@ -332,7 +332,7 @@ export class Job { } const cp = childProcess.spawn(this.containerId ? `docker attach ${this.containerId}` : `bash -e`, { - shell: Utils.getShell(), + shell: 'bash', stdio: ['pipe', 'pipe', 'pipe'], cwd: this.cwd, }); diff --git a/src/utils.ts b/src/utils.ts index be5b3a7e9..aa6c44695 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -6,7 +6,7 @@ export class Utils { static spawn(command: string, cwd = process.cwd(), env: { [key: string]: string | undefined } = process.env): Promise<{ stdout: string, stderr: string, output: string, status: number }> { return new Promise((resolve, reject) => { - const cp = childProcess.spawn(command, {shell: Utils.getShell(), env, cwd}); + const cp = childProcess.spawn(command, {shell: 'bash', env, cwd}); let output = ''; let stdout = ''; @@ -33,10 +33,6 @@ export class Utils { }); } - static getShell() { - return process.env.EXE_PATH ? `${process.env.EXE_PATH}/bash.exe` : `bash`; - } - static printJobNames(job: { name: string }, i: number, arr: { name: string }[]) { if (i === arr.length - 1) { process.stdout.write(`${blueBright(`${job.name}`)}`);