Fix illegal env vars

Signed-off-by: Ryan Bottriell <rbottriell@ilm.com>
spkenv · Jul 12, 2023 · ce7b3c9 · ce7b3c9
1 parent c55abbb
commit ce7b3c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/crates/spk-schema/crates/foundation/src/spec_ops/named.rs b/crates/spk-schema/crates/foundation/src/spec_ops/named.rs
@@ -11,6 +11,10 @@ use crate::name::PkgName;
 pub trait Named {
     /// The name of the associated package
     fn name(&self) -> &PkgName;
+    /// Valid env var of the associated package
+    fn env_name(&self) -> String {
+        self.name().replace('-', "_")
+    }
 }
 
 impl<T: Named> Named for Arc<T> {

diff --git a/crates/spk-solve/crates/solution/src/solution.rs b/crates/spk-solve/crates/solution/src/solution.rs
@@ -252,29 +252,32 @@ impl Solution {
         out.insert("SPK_ACTIVE_PREFIX".to_owned(), "/spfs".to_owned());
         for resolved in self.resolved.iter() {
             let spec = &resolved.spec;
-            out.insert(format!("SPK_PKG_{}", spec.name()), spec.ident().to_string());
             out.insert(
-                format!("SPK_PKG_{}_VERSION", spec.name()),
+                format!("SPK_PKG_{}", spec.env_name()),
+                spec.ident().to_string(),
+            );
+            out.insert(
+                format!("SPK_PKG_{}_VERSION", spec.env_name()),
                 spec.version().to_string(),
             );
             out.insert(
-                format!("SPK_PKG_{}_BUILD", spec.name()),
+                format!("SPK_PKG_{}_BUILD", spec.env_name()),
                 spec.ident().build().to_string(),
             );
             out.insert(
-                format!("SPK_PKG_{}_VERSION_MAJOR", spec.name()),
+                format!("SPK_PKG_{}_VERSION_MAJOR", spec.env_name()),
                 spec.version().major().to_string(),
             );
             out.insert(
-                format!("SPK_PKG_{}_VERSION_MINOR", spec.name()),
+                format!("SPK_PKG_{}_VERSION_MINOR", spec.env_name()),
                 spec.version().minor().to_string(),
             );
             out.insert(
-                format!("SPK_PKG_{}_VERSION_PATCH", spec.name()),
+                format!("SPK_PKG_{}_VERSION_PATCH", spec.env_name()),
                 spec.version().patch().to_string(),
             );
             out.insert(
-                format!("SPK_PKG_{}_VERSION_BASE", spec.name()),
+                format!("SPK_PKG_{}_VERSION_BASE", spec.env_name()),
                 spec.version()
                     .parts
                     .iter()