feat: Add injectable test with dummy profile

Author: Hayao0819

alteriso/src/internal/cmd/cmds.go

@@ -0,0 +1,13 @@
+package cmd
+
+import (
+	"github.com/FascodeNet/alterlinux/src/internal/cmd/injectable"
+	"github.com/FascodeNet/alterlinux/src/internal/cmd/profile"
+)
+
+func init() {
+	rootReg.Add(
+		profile.Cmd(),
+		injectable.Cmd(),
+	)
+}

alteriso/src/internal/cmd/injectable/cmd.go

@@ -0,0 +1,106 @@
+package injectable
+
+import (
+	"embed"
+	"fmt"
+	"io/fs"
+	"os"
+	"os/exec"
+	"path"
+	"path/filepath"
+
+	"github.com/FascodeNet/alterlinux/src/internal/archiso"
+	"github.com/FascodeNet/alterlinux/src/internal/errors"
+	"github.com/FascodeNet/alterlinux/src/internal/logger"
+	"github.com/spf13/cobra"
+)
+
+//go:embed profile
+var emptyProfile embed.FS
+
+func extractEmptyProfile(dest string) error {
+	return fs.WalkDir(emptyProfile, "profile", func(p string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		relPath, err := filepath.Rel("profile", p)
+		if err != nil {
+			return err
+		}
+
+		destPath := filepath.Join(dest, relPath)
+
+		if d.IsDir() {
+			return os.MkdirAll(path.Join(dest, relPath), 0755)
+		}
+
+		data, err := emptyProfile.ReadFile(p)
+		if err != nil {
+			return err
+		}
+
+		return os.WriteFile(destPath, data, 0644)
+	})
+
+}
+
+func TestInjectable() (bool, error) {
+	tmpdir, err := os.MkdirTemp("", "alteriso-injectable-test-")
+	if err != nil {
+		return false, err
+	}
+	defer os.RemoveAll(tmpdir)
+
+	alterisoProfileDir := path.Join(tmpdir, "alteriso")
+	archisoProfileDir := path.Join(tmpdir, "archiso")
+
+	if err := extractEmptyProfile(alterisoProfileDir); err != nil {
+		return false, errors.Wrap(err)
+	}
+
+	// slog.Info("Loading alteriso profile", "dir", archisoProfileDir)
+	profile, err := archiso.NewProfile(alterisoProfileDir, archiso.WithModulesPath(""), archiso.WithbootloadersPath(alterisoProfileDir))
+	if err != nil {
+		return false, errors.Wrap(err)
+	}
+
+	// slog.Info("Generating archiso profile", "dir", archisoProfileDir)
+
+	err = logger.WithoutLog(func() error {
+		return profile.GenArchisoProfile(archisoProfileDir)
+	})
+	if err != nil {
+		return false, errors.Wrap(err)
+	}
+
+	// slog.Info("Testing injectable", "dir", archisoProfileDir)
+	testCmd := exec.Command("fakeroot", "mkarchiso", "-v", archisoProfileDir)
+	if err := testCmd.Run(); err != nil {
+		return false, nil
+	}
+
+	return true, nil
+}
+
+func Cmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "test-injectable",
+		Short: "Test if archiso is injectable",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			injectable, err := TestInjectable()
+			if err != nil {
+				return err
+			}
+			if !injectable {
+				fmt.Println("archiso is not injectable")
+				return nil
+			}
+
+			fmt.Println("archiso is injectable")
+
+			return nil
+		},
+	}
+	return cmd
+}

alteriso/src/internal/cmd/injectable/profile/efiboot/.gitkeep

@@ -0,0 +1,5 @@
+{
+    "arch": "x86_64",
+    "pacman_conf": "/dev/null",
+    "require_injectable": true
+}

alteriso/src/internal/cmd/injectable/profile/grub/.gitkeep

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+arch="x86_64"
+pacman_conf="/dev/null"
+
+__alteriso_injectable="n"
+__alteriso_run_once "alteriso_inject_test"
+if [[ "$__alteriso_injectable" != "y" ]]; then
+    echo "mkarchiso is not injectable." >&2
+    exit 1
+else
+    echo "mkarchiso is injectable." >&2
+    exit 0
+fi

alteriso/src/internal/cmd/injectable/profile/profiledef.json

@@ -7,18 +7,35 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
+	"os/user"
 
 	"github.com/Hayao0819/go-distro"
 	"github.com/Hayao0819/go-distro/linux"
 
-	"github.com/FascodeNet/alterlinux/src/internal/archiso"
+	"github.com/FascodeNet/alterlinux/src/internal/cmd/injectable"
 	"github.com/FascodeNet/alterlinux/src/internal/errors"
 	"github.com/Jguer/go-alpm/v2"
 	"github.com/go-git/go-git/v6"
 	"github.com/go-git/go-git/v6/plumbing"
 	"github.com/spf13/cobra"
 )
 
+/*
+このコードは概ねこれです。
+
+#!/usr/bin/env bash
+set -eEuo pipefail
+if which pacman 2> /dev/null 1>&2 && pacman -Qq archiso; then
+    curl -sL "https://raw.githubusercontent.com/FascodeNet/alterlinux/refs/heads/dev/archiso/mkarchiso" > "/usr/local/bin/mkarchiso"
+else
+    tmpdir=$(mktemp -d)
+    trap 'rm -rf "$tmpdir"' 1 2 3 15
+    git clone https://github.com/FascodeNet/alterlinux "$tmpdir"
+    cd "$tmpdir" || exit 1
+    make install
+fi
+*/
+
 func isPkgInstalled(name ...string) (bool, error) {
 
 	if !isArchLinux() {
@@ -72,7 +89,7 @@ func checkoutBranch(repo *git.Repository, branch string) error {
 	}
 
 	err = w.Checkout(&git.CheckoutOptions{
-		Branch: plumbing.ReferenceName(branch),
+		Branch: plumbing.NewBranchReferenceName(branch),
 	})
 	if err != nil {
 		return err
@@ -108,9 +125,9 @@ func installArchisoCmd() *cobra.Command {
 		Use:   "install-archiso",
 		Short: "Install injectable Archiso",
 		PreRunE: func(cmd *cobra.Command, args []string) error {
-			installed, err := archiso.IsInjectable()
+			installed, err := injectable.TestInjectable()
 			if err != nil {
-				return err
+				installed = false
 			}
 			if installed {
 				return errors.New("archiso-injectable is already installed")
@@ -157,19 +174,26 @@ func installArchisoCmd() *cobra.Command {
 				}
 				return nil
 			} else {
+				if u, err := user.Current(); err == nil && u.Uid != "0" {
+					return errors.New("archiso package is not installed, please run this command as root to install from source")
+				}
+
 				slog.Info("archiso package is not installed, cloning full repository and installing from source")
 				repoURL := fmt.Sprintf("https://github.com/%s/%s.git", githubOwner, githubRepo)
+				slog.Info("Cloning repository", "url", repoURL, "ref", githubRef)
 				repo, tempDir, err := gitCloneIntoTempDir(repoURL)
 				if err != nil {
 					return err
 				}
 				defer os.RemoveAll(tempDir)
 
+				slog.Info("Checking out branch", "branch", githubRef)
 				if err := checkoutBranch(repo, githubRef); err != nil {
 					return err
 				}
 
-				makeCmd := exec.Command("make", "install")
+				slog.Info("Running make install", "dir", tempDir)
+				makeCmd := exec.Command("make", "install-scripts")
 				makeCmd.Dir = tempDir
 				makeCmd.Stdout = os.Stdout
 				makeCmd.Stderr = os.Stderr
@@ -184,8 +208,8 @@ func installArchisoCmd() *cobra.Command {
 
 	cmd.Flags().StringP("script-dest", "", "/usr/local/bin/mkarchiso", "Local destination path for the mkarchiso script")
 	cmd.Flags().StringP("github-owner", "", "FascodeNet", "GitHub owner of the archiso-injectable repository")
-	cmd.Flags().StringP("github-repo", "", "archiso-injectable", "GitHub repository name of the archiso-injectable repository")
-	cmd.Flags().StringP("github-ref", "", "main", "GitHub reference (branch, tag, commit) of the archiso-injectable repository")
+	cmd.Flags().StringP("github-repo", "", "alterlinux", "GitHub repository name of the archiso-injectable repository")
+	cmd.Flags().StringP("github-ref", "", "dev", "GitHub reference (branch, tag, commit) of the archiso-injectable repository")
 
 	return &cmd