Add: Cobra structure

Author: Hayao0819

alteriso5/cmd/build.go

@@ -0,0 +1,10 @@
+package cmd
+
+import (
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build"
+	"github.com/Hayao0819/nahi/cobrautils"
+)
+
+func init() {
+	cobrautils.AddSubCmds(build.Cmd())
+}

alteriso5/cmd/build/build.go

@@ -2,7 +2,6 @@ package build
 
 import (
 	"errors"
-	"fmt"
 	"os"
 	"path"
 
@@ -35,14 +34,3 @@ func build() error {
 	target := config.NewTarget([]string{"x86_64"}, outDir)
 	return work.Build(profile, target)
 }
-
-func Main() {
-	if err := check(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-
-	if err := build(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-	}
-}

alteriso5/cmd/build/cmd.go

@@ -0,0 +1,38 @@
+package build
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/FascodeNet/alterlinux/alteriso5/utils"
+	"github.com/spf13/cobra"
+)
+
+func Cmd() *cobra.Command {
+	cmd := cobra.Command{
+		Use:   "build",
+		Short: "Build an ISO image",
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			utils.OnSignal(func(s os.Signal) {
+				fmt.Println("Received signal:", s)
+				os.Exit(1)
+			}, os.Interrupt)
+			time.Sleep(20 * time.Second)
+
+			if err := check(); err != nil {
+				cmd.PrintErrln(err)
+				os.Exit(1)
+			}
+
+			if err := build(); err != nil {
+				cmd.PrintErrln(err)
+			}
+
+			return nil
+		},
+	}
+
+	return &cmd
+}

alteriso5/cmd/clean.go

@@ -0,0 +1,10 @@
+package cmd
+
+import (
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/clean"
+	"github.com/Hayao0819/nahi/cobrautils"
+)
+
+func init() {
+	cobrautils.AddSubCmds(clean.Cmd())
+}

alteriso5/cmd/clean/cmd.go

@@ -0,0 +1,17 @@
+package clean
+
+import "github.com/spf13/cobra"
+
+func Cmd() *cobra.Command {
+	cmd := cobra.Command{
+		Use:   "clean",
+		Short: "Clean the working directory",
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			return nil
+		},
+	}
+
+	return &cmd
+	
+}

alteriso5/cmd/root.go

@@ -1,7 +1,17 @@
 package cmd
 
-import "github.com/FascodeNet/alterlinux/alteriso5/cmd/build"
+import (
+	"github.com/Hayao0819/nahi/cobrautils"
+	"github.com/spf13/cobra"
+)
 
-func Build() {
-	build.Main()
+func Root() *cobra.Command {
+	root := cobra.Command{
+		Use:   "alteriso5",
+		Short: "AlterISO5 is a tool to build Arch Linux live ISO images",
+	}
+
+	cobrautils.AddSubCmdsToRoot(&root)
+
+	return &root
 }

alteriso5/go.mod

@@ -1,3 +1,10 @@
 module github.com/FascodeNet/alterlinux/alteriso5
 
 go 1.22.2
+
+require (
+	github.com/Hayao0819/nahi v0.0.0-20240206062916-9e007fa67d66 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/spf13/cobra v1.8.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+)

alteriso5/go.sum

@@ -0,0 +1,12 @@
+github.com/Hayao0819/nahi v0.0.0-20240206062916-9e007fa67d66 h1:fylheZbDj30rUrGb4kj9uvtjGsiMREWpKwVQeFDWpUE=
+github.com/Hayao0819/nahi v0.0.0-20240206062916-9e007fa67d66/go.mod h1:P3boyG1B2+4/J6ln65zsY2XRFitM/LcvKppzwXAPjGw=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

alteriso5/main.go

@@ -3,5 +3,8 @@ package main
 import "github.com/FascodeNet/alterlinux/alteriso5/cmd"
 
 func main() {
-	cmd.Build()
+	root := cmd.Root()
+	if err := root.Execute(); err != nil {
+		root.PrintErrln(err)
+	}
 }

alteriso5/utils/dir.go

@@ -0,0 +1,12 @@
+package utils
+
+import "os"
+
+func MkdirsAll(dirs ...string) error {
+	for _, dir := range dirs {
+		if err := os.MkdirAll(dir, 0755); err != nil {
+			return err
+		}
+	}
+	return nil
+}