fix Python shebang

conda · Oct 2, 2024 · d6ffb67 · d6ffb67
1 parent 080a7be
commit d6ffb67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/crates/rattler-bin/src/commands/create.rs b/crates/rattler-bin/src/commands/create.rs
@@ -91,6 +91,9 @@ pub async fn create(opt: Opt) -> anyhow::Result<()> {
     let target_prefix = opt
         .target_prefix
         .unwrap_or_else(|| current_dir.join(".prefix"));
+
+    // Make the target prefix absolute
+    let target_prefix = std::path::absolute(target_prefix)?;
     println!("Target prefix: {}", target_prefix.display());
 
     // Determine the platform we're going to install for

diff --git a/crates/rattler/src/install/link.rs b/crates/rattler/src/install/link.rs
@@ -591,8 +591,12 @@ fn replace_shebang<'a>(
         shebang
     );
 
+
     if old_new.1.contains(' ') {
-        return convert_shebang_to_env(shebang);
+        // we convert the shebang without spaces to a new shebang, and only then replace
+        // which is relevant for the Python case
+        let new_shebang = convert_shebang_to_env(shebang).replace(old_new.0, old_new.1);
+        return new_shebang.into();
     }
 
     let shebang: Cow<'_, str> = shebang.replace(old_new.0, old_new.1).into();