From 3156b59178c9de47c036f50dc49df8c81bafce93 Mon Sep 17 00:00:00 2001
From: Cappy Ishihara <cappy@cappuchino.xyz>
Date: Mon, 2 Oct 2023 04:09:32 +0700
Subject: [PATCH] add clang-devel on the right place

---
 .github/workflows/build-test.yml |  1 +
 src/builder.rs                   | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index ca6f440..4a9dca8 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -52,6 +52,7 @@ jobs:
           cargo \
           systemd-devel \
           mkpasswd \
+          clang-devel \
           moby-engine
 
       - name: Set up QEMU
diff --git a/src/builder.rs b/src/builder.rs
index b7224bd..78fbe33 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -112,7 +112,8 @@ pub fn run_scripts(scripts: Vec<Script>, chroot: &PathBuf, in_chroot: bool) -> R
 
 			info!("Running script: {script}", script = script.name.as_ref().unwrap_or(&"<Untitled>".to_string()));
 			info!("Script ID: {id}", id = script.id.as_ref().unwrap_or(&"<NULL>".to_string()));
-
+			
+			let script_name = format!("script-{}", script.id.as_ref().unwrap_or(&"untitled".to_string()));
 			// check if data has shebang
 			if !data.starts_with("#!") {
 				// if not, add one
@@ -121,22 +122,23 @@ pub fn run_scripts(scripts: Vec<Script>, chroot: &PathBuf, in_chroot: bool) -> R
 			}
 			// write data to chroot
 			let fpath = if in_chroot {
-				chroot.join("tmp/script")
+				chroot.join("tmp").join(&script_name)
 			} else {
-				PathBuf::from("katsu-work/tmp-script")
+				PathBuf::from(format!("katsu-work/{}", &script_name))
 			};
 			let mut file = fs::File::create(fpath)?;
 			file.write_all(data.as_bytes())?;
 			file.flush()?;
 			drop(file);
 
+
 			// now add execute bit
 			if in_chroot {
 				util::run_with_chroot(&chroot, || -> color_eyre::Result<()> {
 					cmd_lib::run_cmd!(
-						chmod +x ${chroot}/tmp/script;
-						chroot ${chroot} /tmp/script;
-						rm -f ${chroot}/tmp/script;
+						chmod +x ${chroot}/tmp/${script_name};
+						chroot ${chroot} /tmp/${script_name};
+						rm -f ${chroot}/tmp/${script_name};
 					)?;
 					Ok(())
 				})?;
@@ -144,8 +146,9 @@ pub fn run_scripts(scripts: Vec<Script>, chroot: &PathBuf, in_chroot: bool) -> R
 				// export envar
 				std::env::set_var("CHROOT", chroot);
 				cmd_lib::run_cmd!(
-					chmod +x katsu-work/tmp-script;
-					/usr/bin/env CHROOT=${chroot} katsu-work/tmp-script;
+					chmod +x katsu-work/${script_name};
+					/usr/bin/env CHROOT=${chroot} katsu-work/${script_name};
+					rm -f katsu-work/${script_name};
 				)?;
 			}