Merge pull request #126 from ublue-os/cleanup-0.8.0

fix: remove debugging
ublue-os · Apr 12, 2023 · 002812d · 002812d
2 parents 5f08d43 + d56eb54
commit 002812d
Show file tree

Hide file tree

Showing 9 changed files with 789 additions and 712 deletions.
diff --git a/completions/fleek.bash b/completions/fleek.bash
diff --git a/completions/fleek.fish b/completions/fleek.fish
diff --git a/completions/fleek.zsh b/completions/fleek.zsh
diff --git a/internal/flake/flake.go b/internal/flake/flake.go
@@ -279,7 +279,6 @@ func (f *Flake) Write(includeSystems bool, message string) error {
 	}
 
 	var bling *fleek.Bling
-	fmt.Println(f.Config.Bling)
 	switch f.Config.Bling {
 	case "high":
 		bling, err = fleek.HighBling()
@@ -295,7 +294,7 @@ func (f *Flake) Write(includeSystems bool, message string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println(bling.Name)
+
 	data := Data{
 		Config: f.Config,
 		Bling:  bling,
@@ -463,7 +462,6 @@ func (f *Flake) Apply() error {
 func (f *Flake) runNix(cmd string, cmdLine []string) ([]byte, error) {
 	command := exec.Command(cmd, cmdLine...)
 	command.Stdin = os.Stdin
-	fmt.Println(f.Config.UserFlakeDir())
 	command.Dir = f.Config.UserFlakeDir()
 	command.Env = os.Environ()
 	if f.Config.Unfree {

diff --git a/internal/fleekcli/eject.go b/internal/fleekcli/eject.go
@@ -60,7 +60,7 @@ func eject(cmd *cobra.Command) error {
 		return err
 	}
 	// TODO app trans
-	fin.Info.Println("Run the following commands from the flake directory to apply your changes:")
+	fin.Info.Println(app.Trans("generate.runFlake"))
 
 	for _, system := range fl.Config.Systems {
 		// nix run --impure home-manager/master -- -b bak switch --flake .#bjk@ghanima

diff --git a/internal/fleekcli/generate.go b/internal/fleekcli/generate.go
@@ -101,7 +101,7 @@ func generate(cmd *cobra.Command) error {
 		return nil
 	}
 	// TODO app trans
-	fin.Info.Println("Run the following commands from the flake directory to apply your changes:")
+	fin.Info.Println(app.Trans("generate.runFlake"))
 
 	for _, system := range fl.Config.Systems {
 		// nix run --impure home-manager/master -- -b bak switch --flake .#bjk@ghanima

diff --git a/locales/en.yml b/locales/en.yml
@@ -53,6 +53,7 @@ generate:
   locationFlagDescription: "location of home-manager configuration, relative to home"
   levelFlag: "level"
   levelFlagDescription: "bling level: `none`,`low`,`default`,`high`"
+  runFlake: "Run the following commands from the flake directory to apply your changes:"
 apply:
   use: "apply"
   long: |

diff --git a/man/en/man1/fleek.1.gz b/man/en/man1/fleek.1.gz
diff --git a/man/pt/man1/fleek.1.gz b/man/pt/man1/fleek.1.gz