diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-12-04 12:32:40 -0500 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-12-04 12:32:40 -0500 |
| commit | 2786b13d7f748984fa270e576eda3542b4438884 (patch) | |
| tree | 256f876ba729a6b2afed2e3906ce8eda05bc88cb | |
| parent | d86653196774af4dd5b7f13bc608a6c21917a7e5 (diff) | |
| download | jscu_refactor-2786b13d7f748984fa270e576eda3542b4438884.tar.gz | |
Generate canonical
| -rw-r--r-- | vars/utils.groovy | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/vars/utils.groovy b/vars/utils.groovy index 105aa54..98e4d49 100644 --- a/vars/utils.groovy +++ b/vars/utils.groovy @@ -49,25 +49,19 @@ def concurrent(configs) { // More sophisticated approach. for (var in myconfig.env_vars) { - // get var name via regex group match. - //def varNameFind = var =~ /^(.*)=/ - //def varName = varNameFind[0][1] def varName = var.tokenize("=")[0] println("var name = ${varName}") - // get var value - //def varValueFind = var =~ /=(.*)/ - //def varValue = varValueFind[0][1].toString() def varValue= var.tokenize("=")[1] println("var value = ${varValue}") // examine var value, if it contains var refs, expand them. - //if (varValue.contains("\$")) { - //if (varValue =~ /\$/) { + if (varValue.contains("\$")) { println("dollar sign") - def expansion = sh(script: "echo SOMETHING", returnStdout: true) - println("EXPANSION = ${expansion}") def expansion2 = sh(script: "echo ${varValue}", returnStdout: true) println("EXPANSION = ${expansion2}") - //} + } + // Convert var value to canonical based on a WORKSPACE base directory. + absVarValue = new File(env.WORKSPACE, varValue).getCanonicalPath() + println("ABS VAR VALUE = ${absVarValue}") } |