chore: env variable cleanup

Osmerion · Mar 4, 2025 · 652acf0 · 652acf0
1 parent ed6299f
commit 652acf0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...rations/gradle/src/main/kotlin/com/osmerion/jvm/launcher/gradle/tasks/BuildJvmLauncher.kt b/...rations/gradle/src/main/kotlin/com/osmerion/jvm/launcher/gradle/tasks/BuildJvmLauncher.kt
@@ -120,7 +120,7 @@ public open class BuildJvmLauncher @Inject constructor(
             this.workingDir = sourceDirectory.get().asFile
 
             environment(buildMap {
-                put("OSMERION_jvmLauncher_descriptor", resources.asFile.absolutePath)
+                put("OSMERION_jvmLauncher_versioninfo", resources.asFile.absolutePath)
 
                 val icon = icon.orNull
                 if (icon != null) put("OSMERION_jvmLauncher_icon", iconResource.asFile.absolutePath)

diff --git a/launcher/build.rs b/launcher/build.rs
@@ -1,8 +1,9 @@
 extern crate embed_resource;
 
 fn main() {
-    let descriptor_path = std::env::var("OSMERION_jvmLauncher_descriptor").unwrap();
-    embed_resource::compile(descriptor_path, embed_resource::NONE).manifest_optional().unwrap();
+    if let Ok(versioninfo_path) = std::env::var("OSMERION_jvmLauncher_versioninfo") {
+        embed_resource::compile(versioninfo_path, embed_resource::NONE).manifest_optional().unwrap();
+    }
 
     if let Ok(icon_path) = std::env::var("OSMERION_jvmLauncher_icon") {
         embed_resource::compile(icon_path, embed_resource::NONE).manifest_optional().unwrap();