hopefully error when script missing

FyraLabs · Oct 1, 2023 · 13d451a · 13d451a
1 parent ee3e5e2
commit 13d451a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -51,18 +51,17 @@ impl Manifest {
 
 		for script in &mut manifest.scripts.pre {
 			if let Some(f) = script.file.as_mut() {
-				let cn = path_can.join(&f);
-				trace!(f = ?cn, "Canonicalizing script path");
-				*f = path_can.join(&f);
+				trace!(f = ?f, "Loading Script file");
+				let cn = path_can.join(&f).canonicalize()?;
+				*f = cn;
 			}
 		}
 
 		for script in &mut manifest.scripts.post {
 			if let Some(f) = script.file.as_mut() {
-
-				let cn = path_can.join(&f);
-				trace!(f = ?cn, "Canonicalizing script path");
-				*f = path_can.join(&f);
+				trace!(f = ?f, "Loading script file");
+				let cn = path_can.join(&f).canonicalize()?;
+				*f = cn;
 			}
 		}
 

diff --git a/tests/ng/katsu.yaml b/tests/ng/katsu.yaml
@@ -28,7 +28,7 @@ scripts:
 
     - id: selinux-label
       name: Relabel SELinux for new filesystem
-      file: selinux-label.sh
+      file: selinux.sh
 
 dnf:
   releasever: 38