Update lib and improve methods

Author: Tom5521

go.mod

@@ -5,7 +5,7 @@ go 1.21
 toolchain go1.21.3
 
 require (
-	github.com/Tom5521/CmdRunTools v1.2.2
+	github.com/Tom5521/CmdRunTools v1.5.0
 	github.com/Tom5521/MyGolangTools v0.0.0-20230816231450-36b02638e41c
 	github.com/gookit/color v1.5.4
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -1,5 +1,5 @@
-github.com/Tom5521/CmdRunTools v1.2.2 h1:cAcJRBLs1vAYkV2kN1+6rEnT/889NonI0IBk1u2JFWU=
-github.com/Tom5521/CmdRunTools v1.2.2/go.mod h1:/OX3Rx+2i6E0UIYSV2xUrk0uENnQAg6gTXSC9ZpGtz4=
+github.com/Tom5521/CmdRunTools v1.5.0 h1:7eV/dxkrvqtv6zgwaMeAEK6QCh3cxcp1wfq0/vt0Y+w=
+github.com/Tom5521/CmdRunTools v1.5.0/go.mod h1:plBMPx+TAzHknZ/yX347w7p2Astm0MWrZS9dF/KCR/4=
 github.com/Tom5521/MyGolangTools v0.0.0-20230816231450-36b02638e41c h1:chvCOXnVMqlAmhYmr3/+W/rjIrP+rjS2YS05b7pXM30=
 github.com/Tom5521/MyGolangTools v0.0.0-20230816231450-36b02638e41c/go.mod h1:QovXEupbIBTOVIJ97GiRFabS4UJQm+Me4n3D2rkf6vg=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

src/src.go

@@ -16,8 +16,8 @@ import (
 
 var (
 	// Functions
-	sh = func() command.UnixCmd {
-		cmd := command.Cmd("")
+	sh = func() command.Cmd {
+		cmd := command.Cmd{}
 		cmd.CustomStd(true, true, true)
 		//cmd.RunWithShell(true)
 		return cmd
@@ -93,6 +93,7 @@ func Format() {
 		swap = partitions.Swap.Format && partitions.Swap.Partition != ""
 	)
 	// Format partitions
+	sh.CustomStd(false, false, true)
 	if boot {
 		fmYellow(f("Formatting Boot <%v> fat32", partitions.Boot.Partition))
 		err = sh.SetAndRun("mkfs.vfat -F 32 " + partitions.Boot.Partition)
@@ -342,8 +343,7 @@ func Keymap() {
 		fmt.Println(err)
 	}
 	if strings.Contains(keys, conf.Keyboard) {
-
-		err := sh.SetAndRun(f("echo exit|echo echo KEYMAP=%v > /mnt/etc/vconsole.conf|arch-chroot /mnt", conf.Keyboard))
+		err := sh.SetAndRun(f("echo KEYMAP=%v > /mnt/etc/vconsole.conf", conf.Keyboard))
 		if err != nil {
 			Error("Error setting KEYMAP in vconsole.conf")
 		}
@@ -379,7 +379,8 @@ func ConfigRootPasswd() {
 func FinalCmds() {
 	var err error
 	if conf.PostInstallChrootCommands != "" {
-		err = sh.SetAndRun(f("echo exit|echo %v|arch-chroot /mnt", conf.PostInstallChrootCommands))
+		sh.SetChroot("/mnt")
+		err = sh.SetAndRun(conf.PostInstallChrootCommands)
 		if err != nil {
 			Error("Error in post-install-chroot cmds")
 		}