Source bash tasks instead of executing them

Tasks/BashV3/Tests/L0.ts

@@ -35,6 +35,30 @@ describe('Bash Suite', function () {
     it('Runs a checked in script correctly', (done: MochaDone) => {
         this.timeout(5000);
 
+        process.env['AZP_BASHV3_OLD_SOURCE_BEHAVIOR'] = false;
+        let tp: string = path.join(__dirname, 'L0External.js');
+        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+
+        tr.run();
+
+        runValidations(() => {
+            assert(tr.succeeded, 'Bash should have succeeded.');
+            assert(tr.stderr.length === 0, 'Bash should not have written to stderr');
+            if (process.platform === 'win32') {
+                // This is different on windows because we change the script name to make sure the normalization call is happening.
+                assert(tr.stdout.indexOf(`Writing bash 'temp/path/script' to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
+            } else {
+                assert(tr.stdout.indexOf(`Writing bash 'path/to/script' to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
+            }
+
+            assert(tr.stdout.indexOf('my script output') > 0,'Bash should have correctly run the script');
+        }, tr, done);
+    });
+
+    it('Runs a checked in script correctly when using the old behavior', (done: MochaDone) => {
+        this.timeout(5000);
+
+        process.env['AZP_BASHV3_OLD_SOURCE_BEHAVIOR'] = true;
         let tp: string = path.join(__dirname, 'L0External.js');
         let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
 
@@ -67,9 +91,9 @@ describe('Bash Suite', function () {
             assert(tr.stderr.length === 0, 'Bash should not have written to stderr');
             if (process.platform === 'win32') {
                 // This is different on windows because we change the script name to make sure the normalization call is happening.
-                assert(tr.stdout.indexOf(`Writing . 'temp/path/script' myCustomArg to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
+                assert(tr.stdout.indexOf(`Writing bash 'temp/path/script' myCustomArg to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
             } else {
-                assert(tr.stdout.indexOf(`Writing . 'path/to/script' myCustomArg to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
+                assert(tr.stdout.indexOf(`Writing bash 'path/to/script' myCustomArg to temp/path/fileName.sh`) > 0, 'Bash should have written the script to a file');
             }
 
             assert(tr.stdout.indexOf('my script output') > 0,'Bash should have correctly run the script');

Tasks/BashV3/Tests/L0Args.ts

@@ -51,7 +51,8 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
         'path/to/script': {
             isFile() {
                 return true;
-            }
+            },
+            mode: '777'
         }
     }
 };

Tasks/BashV3/Tests/L0External.ts

@@ -8,6 +8,7 @@ let tmr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
 tmr.setInput('targetType', 'filepath');
 tmr.setInput('filePath', 'path/to/script');
 tmr.setInput('workingDirectory', '/fakecwd');
+tmr.setInput('AZP_BASHV3_OLD_SOURCE_BEHAVIOR', process.env['AZP_BASHV3_OLD_SOURCE_BEHAVIOR']);
 
 //Create assertAgent and getVariable mocks, support not added in this version of task-lib
 const tl = require('azure-pipelines-task-lib/mock-task');
@@ -50,7 +51,8 @@ let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
         'path/to/script': {
             isFile() {
                 return true;
-            }
+            },
+            mode: '777'
         }
     }
 };

Tasks/BashV3/bash.ts

@@ -1,6 +1,5 @@
 import fs = require('fs');
 import path = require('path');
-import os = require('os');
 import tl = require('azure-pipelines-task-lib/task');
 import tr = require('azure-pipelines-task-lib/toolrunner');
 var uuidV4 = require('uuid/v4');
@@ -45,8 +44,10 @@ async function run() {
         let input_filePath: string;
         let input_arguments: string;
         let input_script: string;
+        let old_source_behavior: boolean;
         let input_targetType: string = tl.getInput('targetType') || '';
         if (input_targetType.toUpperCase() == 'FILEPATH') {
+            old_source_behavior = tl.getBoolInput('AZP_BASHV3_OLD_SOURCE_BEHAVIOR', /*required*/ false);
             input_filePath = tl.getPathInput('filePath', /*required*/ true);
             if (!tl.stats(input_filePath).isFile()) {
                 throw new Error(tl.loc('JS_InvalidFilePath', input_filePath));
@@ -72,7 +73,20 @@ async function run() {
                 targetFilePath = input_filePath;
             }
 
-            contents = `. '${targetFilePath.replace("'", "'\\''")}' ${input_arguments}`.trim();
+            if (old_source_behavior) {
+                contents = `. '${targetFilePath.replace("'", "'\\''")}' ${input_arguments}`.trim();
+            } else {
+                // Check if executable bit is set
+                let stats: fs.Stats = tl.stats(input_filePath);
+                if ((stats.mode & 1) > 0) {
+                    contents = `bash '${targetFilePath.replace("'", "'\\''")}' ${input_arguments}`.trim();
+                }
+                else {
+                    console.log(stats.mode);
+                    tl.warning('Executable bit is not set on target script, sourcing instead of executing. More info at https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/bashnote.md');
+                    contents = `. '${targetFilePath.replace("'", "'\\''")}' ${input_arguments}`.trim();
+                }
+            }
             console.log(tl.loc('JS_FormattedCommand', contents));
         }
         else {
@@ -152,4 +166,4 @@ async function run() {
     }
 }
 
-run();
+run();