update to use /Users/tai

cmd/mg/cmd/clone.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path/filepath"
 	"sync"
 
 	git "github.com/go-git/go-git/v5"
@@ -37,34 +38,26 @@ var (
 			mutex := sync.Mutex{}
 			wg := sync.WaitGroup{}
 			wg.Add(len(conf.Repos))
-			for i := 0; i < jobs; i++ {
+			cloneFunc := func() {
-				go func() {
+				for repo := range repoChan {
-					for repo := range repoChan {
+					_, err := git.PlainOpenWithOptions(repo.Path, &(git.PlainOpenOptions{DetectDotGit: true}))
-						_, err := git.PlainOpenWithOptions(repo.Path, &(git.PlainOpenOptions{DetectDotGit: true}))
+					if err == nil {
-						if err == nil {
+						log.Printf("already cloned: %s\n", repo.Path)
-							log.Printf("already cloned: %s\n", repo.Path)
+						mutex.Lock()
-							mutex.Lock()
+						alreadyCloned++
-							alreadyCloned++
+						mutex.Unlock()
-							mutex.Unlock()
+						wg.Done()
-							wg.Done()
+						continue
-							continue
+					} else if err == git.ErrRepositoryNotExists {
-						} else if err == git.ErrRepositoryNotExists {
+						log.Printf("attempting clone: %s\n", repo.Path)
-							log.Printf("attempting clone: %s\n", repo.Path)
+						parentPath := filepath.Dir(repo.Path)
-							_, err = git.PlainClone(repo.Path, false, &git.CloneOptions{
+						if _, err := os.Stat(parentPath); err != nil {
-								URL: repo.Remote,
+							os.MkdirAll(parentPath, os.ModeDir|os.ModePerm)
-							})
+						}
-							if err != nil {
+						_, err = git.PlainClone(repo.Path, false, &git.CloneOptions{
-								mutex.Lock()
+							URL: repo.Remote,
-								errs = append(errs, RepoError{Error: err, Repo: repo.Path})
+						})
-								mutex.Unlock()
+						if err != nil {
-								log.Printf("clone failed for %s: %v\n", repo.Path, err)
-								wg.Done()
-								continue
-							}
-							fmt.Printf("successfully cloned %s\n", repo.Path)
-							wg.Done()
-							continue
-						} else {
 							mutex.Lock()
 							errs = append(errs, RepoError{Error: err, Repo: repo.Path})
 							mutex.Unlock()
@@ -72,8 +65,21 @@ var (
 							wg.Done()
 							continue
 						}
+						fmt.Printf("successfully cloned %s\n", repo.Path)
+						wg.Done()
+						continue
+					} else {
+						mutex.Lock()
+						errs = append(errs, RepoError{Error: err, Repo: repo.Path})
+						mutex.Unlock()
+						log.Printf("clone failed for %s: %v\n", repo.Path, err)
+						wg.Done()
+						continue
 					}
-				}()
+				}
+			}
+			for i := 0; i < jobs; i++ {
+				go cloneFunc()
 			}
 			fmt.Println(len(conf.Repos))
 			for _, repo := range conf.Repos {

cmd/mg/cmd/common.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"log"
 	"os"
+	"strings"
 
 	"github.com/taigrr/mg/parse"
 )
@@ -27,5 +28,11 @@ func GetConfig() parse.MGConfig {
 			}
 		}
 	}
+	homeDir, _ := os.UserHomeDir()
+	for i, repo := range conf.Repos {
+		if strings.HasPrefix(repo.Path, "$HOME") {
+			conf.Repos[i].Path = strings.Replace(repo.Path, "$HOME", homeDir, 1)
+		}
+	}
 	return conf
 }

cmd/mg/cmd/pull.go

@@ -15,7 +15,7 @@ var (
 	jobs    int
 	pullCmd = &cobra.Command{
 		Use:   "pull",
-		Short: "add current path to list of repos",
+		Short: "update all git repos specified in config",
 		Run: func(_ *cobra.Command, args []string) {
 			type RepoError struct {
 				Error error

cmd/mg/cmd/register.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"strings"
 
 	git "github.com/go-git/go-git/v5"
 	"github.com/spf13/cobra"
@@ -52,6 +53,16 @@ var registerCmd = &cobra.Command{
 			os.Exit(1)
 		}
 		path = newPath.Filesystem.Root()
+
+		homeDir, err := os.UserHomeDir()
+		if err != nil {
+			log.Println("Unable to get home directory")
+			os.Exit(1)
+		}
+		if strings.HasPrefix(path, homeDir) {
+			path = "$HOME" + path[len(homeDir):]
+		}
+
 		for _, v := range conf.Repos {
 			if v.Path == path {
 				fmt.Printf("repo %s already registered\n", path)

go.mod

@@ -1,6 +1,6 @@
 module github.com/taigrr/mg
 
-go 1.21
+go 1.23.1
 
 require (
 	github.com/go-git/go-git/v5 v5.11.0

parse/myrepos.go

@@ -32,9 +32,9 @@ func (m MRConfig) ToMGConfig() MGConfig {
 	mgconf := MGConfig(m)
 	for i, repo := range mgconf.Repos {
 		checkout := repo.Remote
-		if strings.HasPrefix(checkout, "git clone '") {
+		if after, ok := strings.CutPrefix(checkout, "git clone '"); ok {
 			// git clone 'git@bitbucket.org:taigrr/mg.git' 'mg'
-			remote := strings.TrimPrefix(checkout, "git clone '")
+			remote := after
 			sp := strings.Split(remote, "' '")
 			remote = sp[0]
 			mgconf.Repos[i].Remote = remote