--go-src + --recursivev0.0.7

1 files changed, 14 insertions, 4 deletions

diff --git a/main.go b/main.go
index 93ed536..c9ecb2d 100644
--- a/main.go
+++ b/main.go
@@ -27,6 +27,7 @@ func main() {
 		os.Exit(0)
 	}
 
+	// figures out where you're go.work file is
 	wdir, err := findWorkFile()
 	if err != nil {
 		log.Info(err)
@@ -93,6 +94,11 @@ func main() {
 // look for or make a go.work file
 // otherwise use ~/go/src
 func findWorkFile() (string, error) {
+	if myargs.GoSrc {
+		// user put --go-src on the command line so use ~/go/src
+		return useGoSrc()
+	}
+
 	pwd, err := os.Getwd()
 	if err == nil {
 		// Check for go.work in the current directory and then move up until root
@@ -103,7 +109,7 @@ func findWorkFile() (string, error) {
 		}
 
 		// if the user added '--work' on the cmdline, make a work directory and init the go.work file
-		if myargs.Work {
+		if ! myargs.NoWork {
 			pwd, err = os.Getwd()
 			newpwd := filepath.Join(pwd, "work")
 			shell.Mkdir(newpwd)
@@ -119,13 +125,17 @@ func findWorkFile() (string, error) {
 	}
 
 	// there are no go.work files, resume the ~/go/src behavior from prior to golang 1.22
-	// this is the 'old way" and works fine for me. I use it because I like the ~/go/src directory
-	// because I know exactly what is in it: GO stuff & nothing else
+	return useGoSrc()
+}
+
+// this is the 'old way" and works fine for me. I use it because I like the ~/go/src directory
+// because I know exactly what is in it: GO stuff & nothing else
+func useGoSrc() (string, error) {
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
 		return "", err
 	}
-	pwd = filepath.Join(homeDir, "go/src")
+	pwd := filepath.Join(homeDir, "go/src")
 	shell.Mkdir(pwd)
 	os.Chdir(pwd)
 	return pwd, nil