]> Cypherpunks.ru repositories - goredo.git/commitdiff
whichdo friendliness to relative targets
authorSergey Matveev <stargrave@stargrave.org>
Tue, 15 Dec 2020 12:19:46 +0000 (15:19 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Tue, 15 Dec 2020 12:31:55 +0000 (15:31 +0300)
main.go

diff --git a/main.go b/main.go
index ed87a54efa8b84e3706e1436b5f5e59e2c613d62..9df1bc2bfb10f2807aa5c1fe9855a7430d440aa5 100644 (file)
--- a/main.go
+++ b/main.go
@@ -261,6 +261,7 @@ CmdSwitch:
                }
                os.Remove(fdTmp.Name())
                cwd, tgt := cwdAndTgt(tgts[0])
+               cwdRel := cwdMustRel(cwd)
                doFile, upLevels, err := findDo(fdTmp, cwd, tgt)
                if err != nil {
                        break
@@ -283,7 +284,7 @@ CmdSwitch:
                if doFile == "" {
                        ok = false
                } else {
-                       fmt.Println(path.Join(strings.Repeat("..", upLevels), doFile))
+                       fmt.Println(path.Join(cwdRel, strings.Repeat("..", upLevels), doFile))
                }
        default:
                log.Fatalln("unknown command", cmdName)