From 7ab48d57973bd082ed9e6e74ed5bbe80bef3424a Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Fri, 1 Dec 2017 10:52:28 -0500
Subject: var expansion work

---
 vars/utils.groovy | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'vars/utils.groovy')

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}")
-- 
cgit