Add permission for the executable on unix along with tests

Quantco · Nov 27, 2024 · 1151f6a · 1151f6a
1 parent 71058b6
commit 1151f6a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/src/pack.rs b/src/pack.rs
@@ -1,6 +1,7 @@
 use std::{
     collections::{HashMap, HashSet},
     fs::FileTimes,
+    os::unix::fs::PermissionsExt as _,
     path::{Path, PathBuf},
     sync::Arc,
 };
@@ -456,6 +457,13 @@ async fn create_self_extracting_executable(
         .write_all(executable_base64.as_bytes())
         .await?;
 
+    // Make the executable executable
+    if !platform.is_windows() {
+        let mut perms = final_executable.metadata().await?.permissions();
+        perms.set_mode(0o755);
+        final_executable.set_permissions(perms).await?;
+    }
+
     Ok(())
 }
 

diff --git a/tests/integration_test.rs b/tests/integration_test.rs
@@ -446,6 +446,20 @@ async fn test_run_packed_executable(options: Options, required_fs_objects: Vec<&
 
         let pixi_pack_bits = &pack_file_contents[archive_end + "__END_ARCHIVE__".len()..];
         assert!(!pixi_pack_bits.is_empty());
+
+        assert_eq!(pack_file.extension().unwrap(), "ps1");
+        let output = Command::new("powershell")
+            .arg("-File")
+            .arg(&pack_file)
+            .arg("-o")
+            .arg(options.output_dir.path())
+            .output()
+            .expect("Failed to execute packed file for extraction");
+        assert!(
+            output.status.success(),
+            "Packed file execution failed: {:?}",
+            output
+        );
     }
     #[cfg(not(target_os = "windows"))]
     {
@@ -464,13 +478,10 @@ async fn test_run_packed_executable(options: Options, required_fs_objects: Vec<&
 
         let pixi_pack_bits = &pack_file_contents[archive_end + "@@END_ARCHIVE@@".len()..];
         assert!(!pixi_pack_bits.is_empty());
-    }
 
-    #[cfg(target_os = "windows")]
-    {
-        assert_eq!(pack_file.extension().unwrap(), "ps1");
-        let output = Command::new("powershell")
-            .arg("-File")
+        assert_eq!(pack_file.extension().unwrap(), "sh");
+
+        let output = Command::new("bash")
             .arg(&pack_file)
             .arg("-o")
             .arg(options.output_dir.path())
@@ -481,12 +492,8 @@ async fn test_run_packed_executable(options: Options, required_fs_objects: Vec<&
             "Packed file execution failed: {:?}",
             output
         );
-    }
-    #[cfg(not(target_os = "windows"))]
-    {
-        assert_eq!(pack_file.extension().unwrap(), "sh");
-        let output = Command::new("bash")
-            .arg(&pack_file)
+
+        let output = Command::new(&pack_file)
             .arg("-o")
             .arg(options.output_dir.path())
             .output()