From c9de619f98f61a0735f7e038584a9eaab91b84c8 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 10 Mar 2023 23:12:23 -0800
Subject: [PATCH] filelist/hookscripts: use the correct path for scripts

---
 cmd/mkinitfs/main.go                         |  8 ++++----
 internal/filelist/hookscripts/hookscripts.go | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cmd/mkinitfs/main.go b/cmd/mkinitfs/main.go
index 2ae95ac..2e88895 100644
--- a/cmd/mkinitfs/main.go
+++ b/cmd/mkinitfs/main.go
@@ -100,8 +100,8 @@ func main() {
 		hookdirs.New("/etc/mkinitfs/dirs"),
 		hookfiles.New("/usr/share/mkinitfs/files"),
 		hookfiles.New("/etc/mkinitfs/files"),
-		hookscripts.New("/usr/share/mkinitfs/hooks"),
-		hookscripts.New("/etc/mkinitfs/hooks"),
+		hookscripts.New("/usr/share/mkinitfs/hooks", "/hooks"),
+		hookscripts.New("/etc/mkinitfs/hooks", "/hooks"),
 		modules.New(strings.Fields(devinfo.ModulesInitfs), "/usr/share/mkinitfs/modules"),
 		modules.New([]string{}, "/etc/mkinitfs/modules"),
 	}); err != nil {
@@ -116,8 +116,8 @@ func main() {
 	if err := generateArchive("initramfs-extra", compressionFormat, compressionLevel, workDir, []filelist.FileLister{
 		hookfiles.New("/usr/share/mkinitfs/files-extra"),
 		hookfiles.New("/etc/mkinitfs/files-extra"),
-		hookscripts.New("/usr/share/mkinitfs/hooks-extra"),
-		hookscripts.New("/etc/mkinitfs/hooks-extra"),
+		hookscripts.New("/usr/share/mkinitfs/hooks-extra", "/hooks-extra"),
+		hookscripts.New("/etc/mkinitfs/hooks-extra", "/hooks-extra"),
 		modules.New([]string{}, "/usr/share/mkinitfs/modules-extra"),
 		modules.New([]string{}, "/etc/mkinitfs/modules-extra"),
 		osksdl.New(devinfo.MesaDriver),
diff --git a/internal/filelist/hookscripts/hookscripts.go b/internal/filelist/hookscripts/hookscripts.go
index 2eea21f..daf9945 100644
--- a/internal/filelist/hookscripts/hookscripts.go
+++ b/internal/filelist/hookscripts/hookscripts.go
@@ -9,13 +9,16 @@ import (
 )
 
 type HookScripts struct {
+	destPath   string
 	scriptsDir string
 }
 
 // New returns a new HookScripts that will use the given path to provide a list
-// of script files.
-func New(scriptsDir string) *HookScripts {
+// of script files. The destination for each script it set to destPath, using
+// the original file name.
+func New(scriptsDir string, destPath string) *HookScripts {
 	return &HookScripts{
+		destPath:   destPath,
 		scriptsDir: scriptsDir,
 	}
 }
@@ -32,7 +35,8 @@ func (h *HookScripts) List() (*filelist.FileList, error) {
 	}
 	for _, file := range fileInfo {
 		path := filepath.Join(h.scriptsDir, file.Name())
-		files.Add(path, path)
+		log.Printf("-- Including script: %s\n", path)
+		files.Add(path, filepath.Join(h.destPath, file.Name()))
 	}
 	return files, nil
 }