From 58e2079fab53a5950dc22caba6f6bc4c406ecb6e Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Fri, 1 Dec 2017 11:28:18 -0500
Subject: Expansion test

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

(limited to 'vars/utils.groovy')

diff --git a/vars/utils.groovy b/vars/utils.groovy
index aa7a353..f7677e5 100644
--- a/vars/utils.groovy
+++ b/vars/utils.groovy
@@ -50,14 +50,17 @@ def concurrent(configs) {
                     }
                 }
 
-                all_env_vars = sh(script: "env | sort", returnStdout: true)
                 for (var in myconfig.env_vars_map) {
                     paths = var.value.tokenize(":")
                     for (path in paths) {
                         if (path =~ /\$.*:|\$.*/) {
                             subvar = path[1..-1]
-                            if (all_env_vars.contains(subvar)) {
+                            var_exists = sh(script: "[ ! -z ${subvar} ]", returnStatus: true)
+                            if (var_exists) {
                                 println("${subvar} exists in all vars.")
+                                var_value = sh(script: "echo ${subvar}", returnStdout: true)
+                                expanded = var.replaceAll(subvar, var_value)
+                                println("REPLACED SUBVAR: ${expanded}")
                             }
                         }
                         def cpath = new File("${env.WORKSPACE}", var.value).getCanonicalPath()
-- 
cgit