aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Rendina <mrendina@stsci.edu>2017-12-01 10:52:28 -0500
committerMatt Rendina <mrendina@stsci.edu>2017-12-01 10:52:28 -0500
commit7ab48d57973bd082ed9e6e74ed5bbe80bef3424a (patch)
tree25366fbde73100320c3ea4e4e0adb14031faf839
parent59510eb733d43442e5ecdfb824cde0c693f81905 (diff)
downloadjscu_refactor-7ab48d57973bd082ed9e6e74ed5bbe80bef3424a.tar.gz
var expansion work
-rw-r--r--vars/utils.groovy15
1 files changed, 13 insertions, 2 deletions
diff --git a/vars/utils.groovy b/vars/utils.groovy
index 9632128..aa7a353 100644
--- a/vars/utils.groovy
+++ b/vars/utils.groovy
@@ -49,9 +49,20 @@ def concurrent(configs) {
env.PATH = "${tvar}:${env.PATH}"
}
}
+
+ all_env_vars = sh(script: "env | sort", returnStdout: true)
for (var in myconfig.env_vars_map) {
- def cpath= new File("${env.WORKSPACE}", var.value).getCanonicalPath()
- println("task: cpath = ${cpath}")
+ paths = var.value.tokenize(":")
+ for (path in paths) {
+ if (path =~ /\$.*:|\$.*/) {
+ subvar = path[1..-1]
+ if (all_env_vars.contains(subvar)) {
+ println("${subvar} exists in all vars.")
+ }
+ }
+ def cpath = new File("${env.WORKSPACE}", var.value).getCanonicalPath()
+ println("task: cpath = ${cpath}")
+ }
}
println("task: env.PATH = ${env.PATH}")
println("task: myconfig.nodetype = ${myconfig.nodetype}")