Merge pull request #107 from ublue-os/spinning

fix: init --clone with existing system failure

Author: bketelsen

grp/manpages/goreleaser

@@ -53,13 +53,7 @@ func initialize(cmd *cobra.Command) error {
 	ux.Description.Println(cmd.Short)
 	var upstream string
 	loc := cmd.Flag(app.Trans("init.locationFlag")).Value.String()
-	/*home, err := os.UserHomeDir()
-	if err != nil {
-		return err
-	}
-	// hack!
-	//floc := filepath.Join(home, loc)
-	*/
+
 	f.config = &core.Config{
 		FlakeDir: loc,
 	}
@@ -73,7 +67,6 @@ func initialize(cmd *cobra.Command) error {
 		// clone it
 		spinner, err := ux.Spinner().Start(app.Trans("init.cloning"))
 		if err != nil {
-			spinner.Fail()
 			return err
 		}
 		err = f.config.Clone(upstream)
@@ -135,7 +128,6 @@ func initialize(cmd *cobra.Command) error {
 			if err != nil {
 				return err
 			}
-
 			// only re-apply the templates if not `ejected`
 			if !f.config.Ejected {
 				if verbose {
@@ -166,18 +158,41 @@ func initialize(cmd *cobra.Command) error {
 						if err != nil {
 							return err
 						}
+						repo, err := f.Repo()
+						if err != nil {
+							return err
+						}
+						out, err := repo.Commit()
+						if verbose {
+							ux.Info.Println(string(out))
+						}
+						if err != nil {
+							return err
+						}
 					}
 				}
-
 				if verbose {
 					ux.Info.Println(app.Trans("apply.writingFlake"))
 				}
 				err = f.flake.Write(includeSystems)
 				if err != nil {
 					return err
 				}
+				repo, err := f.Repo()
+				if err != nil {
+					return err
+				}
+				out, err := repo.Commit()
+				if verbose {
+					ux.Info.Println(string(out))
+				}
+				if err != nil {
+					return err
+				}
 
 			}
+			spinner.Success()
+
 			ux.Info.Println(app.Trans("apply.applyingConfig"))
 			out, err := f.flake.Apply()
 			if err != nil {
@@ -186,13 +201,12 @@ func initialize(cmd *cobra.Command) error {
 				if errors.Is(err, nix.ErrPackageConflict) {
 					ux.Fatal.Println(app.Trans("global.errConflict"))
 				}
-				spinner.Fail()
 				return err
 			}
 			if verbose {
 				ux.Info.Println(string(out))
 			}
-			spinner.Success(app.Trans("apply.done"))
+			ux.Info.Println(app.Trans("apply.done"))
 			return nil
 		}
 		ux.Info.Println(app.Trans("init.cloned"))

grp/manpages/goreleaser.1.gz

@@ -53,7 +53,7 @@ apply:
   commitError: "Error committing changes to local repository"
   checkingSystem: "Checking for current system in flake"
   newSystem: "New system detected"
-  applyingConfig: "Applying config to flake"
+  applyingConfig: "Applying config to flake, please wait..."
   dryApplyingConfig: "Not Applying config to flake, dry run"
   done: "Complete!"
 init: