From 572270ba91dc527c1f69736f86e8c7d4886edde9 Mon Sep 17 00:00:00 2001
From: haiyux <haiyux@foxmail.com>
Date: Tue, 26 Apr 2022 21:06:30 +0800
Subject: [PATCH] fix: fix choose failed when paths cmd/server (#1954)

---
 cmd/kratos/internal/run/run.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/cmd/kratos/internal/run/run.go b/cmd/kratos/internal/run/run.go
index 53ef7abca..905f4ea55 100644
--- a/cmd/kratos/internal/run/run.go
+++ b/cmd/kratos/internal/run/run.go
@@ -51,14 +51,15 @@ func Run(cmd *cobra.Command, args []string) {
 				cmdPaths = append(cmdPaths, k)
 			}
 			prompt := &survey.Select{
-				Message: "Which directory do you want to run?",
-				Options: cmdPaths,
+				Message:  "Which directory do you want to run?",
+				Options:  cmdPaths,
+				PageSize: 10,
 			}
 			e := survey.AskOne(prompt, &dir)
 			if e != nil || dir == "" {
 				return
 			}
-			dir = path.Join(cmdPath[dir], dir)
+			dir = cmdPath[dir]
 		}
 	}
 	fd := exec.Command("go", "run", ".")
@@ -72,6 +73,13 @@ func Run(cmd *cobra.Command, args []string) {
 }
 
 func findCMD(base string) (map[string]string, error) {
+	wd, err := os.Getwd()
+	if err != nil {
+		return nil, err
+	}
+	if !strings.HasSuffix(wd, "/") {
+		wd += "/"
+	}
 	var root bool
 	next := func(dir string) (map[string]string, error) {
 		cmdPath := make(map[string]string)
@@ -84,7 +92,8 @@ func findCMD(base string) (map[string]string, error) {
 				}
 				for _, fileInfo := range paths {
 					if fileInfo.IsDir() {
-						cmdPath[path.Join("cmd", fileInfo.Name())] = filepath.Join(walkPath, "..")
+						abs := path.Join(walkPath, fileInfo.Name())
+						cmdPath[strings.TrimPrefix(abs, wd)] = abs
 					}
 				}
 				return nil