cleanup

Author: Keloran

apps/apps.go

@@ -104,7 +104,7 @@ func (a Apps) brewInstall() error {
 	return nil
 }
 
-func (a Apps) InstallCLI() error {
+func (a Apps) Install() error {
 	if err := xcode(); err != nil {
 		return fmt.Errorf("cli xcode install: %w", err)
 	}

apps/gui.go

@@ -3,7 +3,8 @@ package dots
 import (
 	"fmt"
 
-	"github.com/Keloran/dotfilesLoader/files"
+  "github.com/Keloran/dotfilesLoader/console"
+  "github.com/Keloran/dotfilesLoader/files"
 )
 
 type Dots struct {
@@ -20,6 +21,9 @@ func (d Dots) Install() error {
 		Name     string
 	}
 
+  c := console.NewConsole(false)
+  c.Start("DotFiles")
+
 	if d.Github.Repository != "" {
 		filesLocation, err := files.Downloader{
 			GithubDetails: d.Github,
@@ -56,6 +60,7 @@ func (d Dots) Install() error {
 				if err = files.Copy(dot.Location, fmt.Sprintf("%s/%s", d.CurrentDir, dot.Name)); err != nil {
 					return fmt.Errorf("Dotfiles copy: %w", err)
 				}
+				c.Info(fmt.Sprintf("%s Copied", dot.Name))
 			}
 		}
 
@@ -64,6 +69,6 @@ func (d Dots) Install() error {
 		}
 	}
 
-	fmt.Print("dotfiles installed\n")
+  c.End("DotFiles")
 	return nil
 }

dots/dots.go

@@ -16,8 +16,7 @@ func Help() {
 		BlankLine().
 		Info("Commands:").
 		FormattedText(fmt.Sprintf(hFormat, console.Cyan("help"), console.Blue("  This message"))).
-		FormattedText(fmt.Sprintf(hFormat, console.Cyan("cli"), console.Blue("   Install CLI Apps"))).
-		FormattedText(fmt.Sprintf(hFormat, console.Cyan("gui"), console.Blue("   Install GUI Apps"))).
+		FormattedText(fmt.Sprintf(hFormat, console.Cyan("apps"), console.Blue("   Install Apps"))).
 		FormattedText(fmt.Sprintf(hFormat, console.Cyan("os"), console.Blue("    Install OS Settings"))).
 		FormattedText(fmt.Sprintf(hFormat, console.Cyan("dots"), console.Blue("  Install the dotfiles"))).
 		FormattedText(fmt.Sprintf(hFormat, console.Cyan("update"), console.Blue("Run updaters"))).

help.go

@@ -29,7 +29,7 @@ func main() {
 		}
 	}
 
-	var dotfiles, appsGUI, appsCLI, OS, all bool
+	var dotfiles, appsInstall, OS, all bool
 	help := true
 	all = true
 
@@ -40,12 +40,8 @@ func main() {
 		dotfiles = true
 		all = false
 		help = false
-	case "gui":
-		appsGUI = true
-		all = false
-		help = false
-	case "cli":
-		appsCLI = true
+	case "apps":
+		appsInstall = true
 		help = false
 		all = false
 	case "help":
@@ -93,33 +89,17 @@ func main() {
 		Skip:     *skip,
 		Github:   Github,
 	}
-	// GUI
-	if appsGUI {
-		// need sudo password
-		if err := app.SetSudo(); err != nil {
-			console.NewConsole(false).Error(fmt.Sprintf("Sudo err: %+v", err))
-		}
-
-		// GUI install
-		fmt.Print("Apps GUI\n")
-		if err = app.InstallGUI(); err != nil {
-			console.NewConsole(false).Error(fmt.Sprintf("GUI err: %+v", err))
-		}
-
-		fmt.Print("Apps GUI\n")
-		return
-	}
 
 	// CLI
-	if appsCLI {
+	if appsInstall {
 		// need sudo password
 		if err := app.SetSudo(); err != nil {
 			console.NewConsole(false).Error(fmt.Sprintf("Sudo err: %+v", err))
 		}
 
 		// CLI install
-		fmt.Print("Apps CLI\n")
-		if err = app.InstallCLI(); err != nil {
+		fmt.Print("Apps\n")
+		if err = app.Install(); err != nil {
 			console.NewConsole(false).Error(fmt.Sprintf("CLI err: %v", err))
 		}
 		return

main.go

@@ -0,0 +1,10 @@
+package os
+
+type OS struct {
+  Username string
+  SudoPassword string
+  Skip bool
+  Force bool
+}
+
+