Merge pull request #1115 from pkgxdev/env-overrides

parent env can override pantry runtime env

Author: mxcl

crates/cli/src/main.rs

@@ -12,6 +12,7 @@ use libpkgx::{
     config::Config, env, hydrate::hydrate, install_multi, pantry_db, resolve::resolve, sync,
     types::PackageReq, utils,
 };
+use regex::Regex;
 use rusqlite::Connection;
 use serde_json::json;
 
@@ -207,6 +208,21 @@ async fn main() -> Result<(), Box<dyn Error>> {
         let env = env::mix(env);
         let mut env = env::mix_runtime(&env, &installations, &conn)?;
 
+        let re = Regex::new(r"^\$\{\w+:-([^}]+)\}$").unwrap();
+
+        for (key, value) in env.clone() {
+            if let Some(caps) = re.captures(&value) {
+                env.insert(key, caps.get(1).unwrap().as_str().to_string());
+            } else {
+                let cleaned_value = value
+                    .replace(&format!(":${}", key), "")
+                    .replace(&format!("${}:", key), "")
+                    .replace(&format!("; ${}", key), "") // one pantry instance of this
+                    .replace(&format!("${}", key), "");
+                env.insert(key, cleaned_value);
+            }
+        }
+
         // fork bomb protection
         env.insert("PKGX_LVL".to_string(), pkgx_lvl.to_string());
 
@@ -220,7 +236,11 @@ async fn main() -> Result<(), Box<dyn Error>> {
             let env = env.iter().map(|(k, v)| (k.clone(), v.join(":"))).collect();
             let env = env::mix_runtime(&env, &installations, &conn)?;
             for (key, value) in env {
-                println!("{}=\"{}${{{}:+:${}}}\"", key, value, key, key);
+                println!(
+                    "{}=\"{}\"",
+                    key,
+                    value.replace(&format!(":${}", key), &format!("${{{}:+:${}}}", key, key))
+                );
             }
         } else {
             let mut runtime_env = HashMap::new();

crates/lib/src/env.rs

@@ -138,22 +138,28 @@ pub fn mix_runtime(
     installations: &Vec<Installation>,
     conn: &Connection,
 ) -> Result<HashMap<String, String>, Box<dyn Error>> {
-    let mut output = input.clone();
+    let mut output: HashMap<String, String> = input
+        .iter()
+        .map(|(k, v)| (k.clone(), format!("{}:${}", v, k)))
+        .collect();
 
     for installation in installations.clone() {
         let runtime_env =
             crate::pantry_db::runtime_env_for_project(&installation.pkg.project, conn)?;
         for (key, runtime_value) in runtime_env {
             let runtime_value = expand_moustaches(&runtime_value, &installation, installations);
-            let new_value = match output.get(&key) {
-                Some(curr_value) => runtime_value.replace(&format!("${}", key), curr_value),
-                None => {
-                    //TODO need to remove any $FOO, aware of `:` delimiters
-                    runtime_value
-                        .replace(&format!(":${}", key), "")
-                        .replace(&format!("${}:", key), "")
-                        .replace(&format!("${}", key), "")
+            let new_value = if let Some(curr_value) = output.get(&key) {
+                if runtime_value.contains(&format!("${}", key)) {
+                    runtime_value.replace(&format!("${}", key), curr_value)
+                } else {
+                    // parent env overrides runtime env if the runtime env
+                    // has no capacity to include the parent env
+                    curr_value.clone()
                 }
+            } else if runtime_value.contains(&format!("${}", key)) {
+                runtime_value
+            } else {
+                format!("${{{}:-{}}}", key, runtime_value)
             };
             output.insert(key, new_value);
         }