From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 15 Dec 2020 12:19:46 +0000 (+0300)
Subject: whichdo friendliness to relative targets
X-Git-Tag: v0.6.0~1
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=a5111e179e5aca57420fd1cc95c1b21e7cd34226

whichdo friendliness to relative targets
---

diff --git a/main.go b/main.go
index ed87a54..9df1bc2 100644
--- 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)