runTask: Collect output using sh()

c5e5dd1c · Andrew Nicols · 4ad79748 · c5e5dd1c
Commit c5e5dd1c authored Dec 15, 2017 by Andrew Nicols
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

vars/runTask.groovy vars/runTask.groovy +5 -1

No files found.
--- a/vars/runTask.groovy
+++ b/vars/runTask.groovy
@@ -50,7 +50,11 @@ def call(String task, String branch, String repo, String phpversion, String data

            stage("Detect Moodle Version") {
                steps {
-                    moodleversion = sh grep "\$branch" moodle/version.php | sed "s/^[^']*'\\([^']*\\).*\$/\\1/"
+                    moodleversion = sh (
+                        script: 'grep "\$branch" moodle/version.php | sed
+                        "s/^[^']*'\\([^']*\\).*\$/\\1/"',
+                        returnStdout: true
+                    ).trim()
                    runner = "${env.PATHTORUNNER}/${moodleversion}"
                    if (!fileExists(runner)) {
                        runner  "${env.PATHTORUNNER}/master"