Optimize the program & add support to i386 architecture

Author: Tom5521

.gitignore

@@ -1,9 +1,9 @@
 *.test
 test.*
 *.exe
-test*
 config.yml
 ArchLinuxInstaller
 pacman.conf
 .viminfo
 builds
+.zcompdump

README.md

@@ -1,2 +1,55 @@
 # ArchLinux Installer (writed in go)
 
+## Usage
+
+First execute the binary with the `newconfig` arg, like this to create a empty config file
+```./[binary] [arg]
+```
+After the configuration of the file execute `install` arg to init the installation
+
+### Configuration
+
+The YAML file is a data structure used to configure the installation parameters of the provided Python script. Below are the available configuration options:
+
+`custom_pacman_config`: A boolean value indicating whether to use a custom pacman configuration. The default value is "false". 
+`keyboard`: Configures the keyboard layout for the installation. The default value is an empty string.
+
+#### Wifi
+
+- `wifi`: An object specifying the wireless network configuration. It consists of the following four properties: 
+1. `state`: A boolean value indicating whether to enable the wireless connection. The default value is "false". 
+2. `name`: The name of the wireless network to connect to. The default value is an empty string. 
+3. `adapter`: The wireless network adapter to use for the connection. The default value is an empty string. 
+4. `password`: The password for the wireless network. The default value is an empty string.
+
+#### Partitions
+
+`partitions`: An object specifying the partitions to be used for the installation. It consists of the following properties:
+
+1.  `boot`: An object specifying the boot partition. It consists of the following properties:
+
+*   `partition`: The partition device. The default value is "".
+*   `format`: A boolean value indicating whether to format the partition. The default value is "".
+*   `filesystem`: The file system to be used for the partition. The default value is "".
+
+2.  `root`: An object specifying the root partition. It has the same properties as the boot partition.
+3.  `home`: An object specifying the home folder partition. It has the same properties as the boot partition.
+4.  `swap`: An object specifying the swap partition. It has the same properties as the boot partition, except it does not have the "filesystem" property.
+
+#### Extra Configs
+
+`grub_install_disk`: The storage device where the GRUB bootloader will be installed. The default value is "".
+
+`pacstrap_skip`: A boolean value indicating whether to skip the installation of Arch Linux basic packages. The default value is "false".
+
+`additional_packages`: A string specifying the additional packages to install. The default value is an empty string.
+
+`uefi`: A boolean value indicating whether the system uses UEFI instead of BIOS. The default value is "false".
+
+`arch-chroot`: A boolean value indicating whether to run the script in the Arch Linux chroot environment. The default value is "false".
+
+`post_install_commands`: A string specifying the commands to be executed after the package installation. The default value is an empty string.
+
+`post_install_chroot_commands`: A string specifying the commands to be executed after the package installation in the Arch Linux chroot environment. The default value is an empty string.
+
+`reboot`: Allows specifying whether to restart the system after installation. If this field is omitted, the default configuration will be used.

build.sh

@@ -4,3 +4,5 @@ export GOARCH=arm64
 go build -o builds/arm64/ArchInstaller-arm64 .
 export GOARCH=amd64
 go build -o builds/amd64/ArchInstaller-amd64 .
+export GOARCH=386
+go build -o builds/i386/ArchInstaller-i386 .

data/data.go

@@ -4,24 +4,18 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/Tom5521/MyGolangTools/file"
 	"github.com/gookit/color"
 	"gopkg.in/yaml.v3"
 )
 
 var (
-	Yellow   = color.FgYellow.Render
-	Red      = color.FgRed.Render
-	filename = "config.yml"
+	Yellow    = color.FgYellow.Render
+	Red       = color.FgRed.Render
+	Pfilename = filename
+	filename  = "config.yml"
 )
 
-func CheckDir(dir string) bool {
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		return false
-	} else {
-		return true
-	}
-}
-
 type yamlfile struct {
 	CustomPacmanConfig bool   `yaml:"custom_pacman_config"`
 	Keyboard           string `yaml:"keyboard"`
@@ -64,15 +58,15 @@ type yamlfile struct {
 
 func GetYamldata() yamlfile {
 	yamldata := yamlfile{}
-	if !CheckDir(filename) {
+	if check, _ := file.CheckFile(filename); !check {
 		fmt.Printf(Red(filename+" not found...") + Yellow("Creating a new one...\n"))
 		NewYamlFile()
-		if CheckDir(filename) {
+		if newcheck, _ := file.CheckFile(filename); newcheck {
 			color.Green.Println("config file created!!!")
 		}
 		os.Exit(0)
 	}
-	file, err := os.ReadFile(filename)
+	file, err := file.ReadFileCont(filename)
 	if err != nil {
 		color.Red.Println("Error reading " + filename)
 	}
@@ -85,18 +79,12 @@ func GetYamldata() yamlfile {
 
 func NewYamlFile() {
 	yamlstruct := yamlfile{}
-	file, err := os.Create(filename)
-	if err != nil {
-		color.Red.Println("Error creating " + filename)
-		return
-	}
-	defer file.Close()
 	data, err := yaml.Marshal(yamlstruct)
 	if err != nil {
 		color.Red.Println("Error Marshalling config file")
 		return
 	}
-	_, err = file.WriteString(string(data))
+	err = file.ReWriteFile(filename, string(data))
 	if err != nil {
 		color.Red.Println("Error writing the data in the new yml file")
 		return

go.mod

@@ -3,7 +3,7 @@ module github.com/Tom5521/ArchLinuxInstaller
 go 1.21.0
 
 require (
-	github.com/Tom5521/MyGolangTools v0.0.0-20230806053540-1d169699a019 // indirect
+	github.com/Tom5521/MyGolangTools v0.0.0-20230816231450-36b02638e41c // indirect
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
 	golang.org/x/sys v0.10.0 // indirect

go.sum

@@ -1,5 +1,7 @@
 github.com/Tom5521/MyGolangTools v0.0.0-20230806053540-1d169699a019 h1:SNXIavRN8EMNEZb8LVOFEZl1pgvPALH5UIHrlOBM8Qw=
 github.com/Tom5521/MyGolangTools v0.0.0-20230806053540-1d169699a019/go.mod h1:QovXEupbIBTOVIJ97GiRFabS4UJQm+Me4n3D2rkf6vg=
+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/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
 github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
 github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=

main.go

@@ -3,9 +3,14 @@ package main
 import (
 	"os"
 
+	"github.com/Tom5521/ArchLinuxInstaller/data"
 	"github.com/Tom5521/ArchLinuxInstaller/src"
+	"github.com/Tom5521/MyGolangTools/commands"
+	"github.com/gookit/color"
 )
 
+var sh = commands.Sh{}
+
 func main() {
 	if len(os.Args) > 1 {
 		if os.Args[1] == "install" {
@@ -30,5 +35,12 @@ func main() {
 			src.Fstab()
 			src.Grub()
 		}
+		if os.Args[1] == "newconfig" {
+			data.NewYamlFile()
+			err := sh.Cmd("vim " + data.Pfilename)
+			if err != nil {
+				color.Red.Println("Error oppening vim." + err.Error())
+			}
+		}
 	}
 }

src/src.go

@@ -7,19 +7,22 @@ import (
 
 	"github.com/Tom5521/ArchLinuxInstaller/data"
 	"github.com/Tom5521/MyGolangTools/commands"
+	"github.com/Tom5521/MyGolangTools/file"
 	"github.com/gookit/color"
 )
 
 var (
+	// Functions
+	sh       = commands.Sh{}
+	f        = fmt.Sprintf // Set a more comfortable alias for fmt.Sprintf()
+	fmRed    = color.Red.Println
+	fmGreen  = color.Green.Println
+	fmYellow = color.Yellow.Println
+	// Data
 	conf       = data.GetYamldata()
 	partitions = conf.Partitions
 	wifi       = conf.Wifi
-	sh         = commands.Sh{}
-	f          = fmt.Sprintf
 	wifi_pkg   string
-	fmRed      = color.Red.Println
-	fmGreen    = color.Green.Println
-	fmYellow   = color.Yellow.Println
 	pacmanConf = `
 #Pacman-config-modifyed by Tom5521 ---YES---THATS---MODIFIED---
 
@@ -112,7 +115,7 @@ func Mount() {
 	}
 	if conf.Uefi {
 		fmYellow("uefi is true")
-		if !data.CheckDir("/mnt/efi") {
+		if check_efi, _ := file.CheckFile("/mnt/efi"); !check_efi {
 			err = os.Mkdir("/mnt/efi", os.ModePerm)
 			if err != nil {
 				fmRed("Error making /mnt/efi")
@@ -127,7 +130,7 @@ func Mount() {
 		} else {
 			fmGreen("Boot mounted successfully!")
 		}
-	} else if !data.CheckDir("/mnt/boot") {
+	} else if check_Boot, _ := file.CheckFile("/mnt/boot"); !check_Boot {
 		err = os.Mkdir("/mnt/boot", os.ModePerm)
 		if err != nil {
 			fmRed("Error making /mnt/boot")
@@ -143,7 +146,7 @@ func Mount() {
 		}
 	}
 	if partitions.Home.Partition != "" {
-		if !data.CheckDir("/mnt/home") {
+		if checkdir, _ := file.CheckFile("/mnt/home"); !checkdir {
 			err = os.Mkdir("/mnt/home", os.ModePerm)
 			if err != nil {
 				fmRed("Error making /mnt/home")
@@ -172,22 +175,18 @@ func Mount() {
 }
 
 func PacmanConf() {
-	if conf.CustomPacmanConfig && !data.CheckDir("pacman.conf") {
+	if check_pacman_cfg, _ := file.CheckFile("pacman.conf"); conf.CustomPacmanConfig && !check_pacman_cfg {
 		fmYellow("No custom pacman conf found... Creatig a new one...")
-		file, err := os.Create("pacman.conf")
+		err := file.ReWriteFile("pacman.conf", pacmanConf)
 		if err != nil {
-			fmRed("Error Creating new pacman.conf file")
-		}
-		_, err = file.WriteString(pacmanConf)
-		if err != nil {
-			fmRed("Error writing new pacman.conf")
+			fmRed("Error creating new pacman.conf")
 		} else {
 			fmGreen("pacman.conf created successfully!")
 		}
 	}
-	pacmanfl, _ := os.ReadFile("/etc/pacman.conf")
+	pacmanfl, _ := file.ReadFileCont("/etc/pacman.conf")
 	if conf.CustomPacmanConfig && !strings.Contains("---YES---THATS---MODIFIED---", string(pacmanfl)) {
-		err := sh.Cmd("cp pacman.conf /etc/")
+		err := file.ReWriteFile("/etc/pacman.conf", pacmanConf)
 		if err != nil {
 			fmRed("Error copying pacman.conf file")
 		} else {