diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-12-01 11:28:18 -0500 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-12-01 11:28:18 -0500 |
| commit | 58e2079fab53a5950dc22caba6f6bc4c406ecb6e (patch) | |
| tree | beebf49aab3d61babe002d01eae269e2b4ea1e45 /vars | |
| parent | 7ab48d57973bd082ed9e6e74ed5bbe80bef3424a (diff) | |
| download | jscu_refactor-58e2079fab53a5950dc22caba6f6bc4c406ecb6e.tar.gz | |
Expansion test
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/utils.groovy | 7 |
1 files changed, 5 insertions, 2 deletions
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() |