Add: check command

Author: Hayao0819

alteriso5/cmd/build/build.go

@@ -1,21 +1,13 @@
 package build
 
 import (
-	"errors"
 	"os"
 	"path"
 
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/config"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work"
 )
 
-func check() error {
-	if os.Getuid() != 0 {
-		return errors.New("this program must be run as root")
-	}
-	return nil
-}
-
 func build() error {
 	current, err := os.Getwd()
 	if err != nil {
@@ -32,7 +24,7 @@ func build() error {
 
 	// Dummy profile
 	profile := config.Profile{
-		Base: path.Join(current, "profile"),
+		Base:       path.Join(current, "profile"),
 		InstallDir: "alter",
 	}
 

alteriso5/cmd/build/cmd.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/check"
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	"github.com/spf13/cobra"
 )
@@ -19,13 +20,12 @@ func Cmd() *cobra.Command {
 				os.Exit(1)
 			}, os.Interrupt)
 
-			if err := check(); err != nil {
-				cmd.PrintErrln(err)
-				os.Exit(1)
+			if err := utils.CallCmd(cmd, *check.Cmd()); err != nil {
+				return err
 			}
 
 			if err := build(); err != nil {
-				cmd.PrintErrln(err)
+				return err
 			}
 
 			return nil

alteriso5/cmd/check.go

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

alteriso5/cmd/check/cmd.go

@@ -0,0 +1,29 @@
+package check
+
+import (
+	"errors"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+func check() error {
+	if os.Getuid() != 0 {
+		return errors.New("this program must be run as root")
+	}
+	return nil
+}
+
+func Cmd() *cobra.Command {
+	cmd := cobra.Command{
+		Use:   "check",
+		Short: "Check if the system is ready to build the ISO",
+		SilenceUsage: true,
+		SilenceErrors: true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return check()
+		},
+	}
+
+	return &cmd
+}

alteriso5/cmd/build/check/mksquashfs.go alteriso5/cmd/check/mksquashfs.goalteriso5/cmd/build/check/mksquashfs.go renamed to alteriso5/cmd/check/mksquashfs.go

@@ -0,0 +1 @@
+package check

alteriso5/cmd/build/check/os.go alteriso5/cmd/check/os.goalteriso5/cmd/build/check/os.go renamed to alteriso5/cmd/check/os.go

@@ -0,0 +1,11 @@
+package utils
+
+import "github.com/spf13/cobra"
+
+func CallCmd(me *cobra.Command, target cobra.Command, args ...string) error {
+	target.SetOut(me.OutOrStdout())
+	target.SetErr(me.OutOrStderr())
+	target.SetIn(me.InOrStdin())
+	target.SetArgs(args)
+	return target.Execute()
+}