]> Cypherpunks.ru repositories - goredo.git/commitdiff
Print found .do
authorSergey Matveev <stargrave@stargrave.org>
Mon, 14 Dec 2020 16:40:11 +0000 (19:40 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Mon, 14 Dec 2020 16:40:13 +0000 (19:40 +0300)
Previously only non-existent ones were printed out.

main.go

diff --git a/main.go b/main.go
index 6cda53efec6821a59a0b3d7562bd390ea3928d40..afed8e0cc356215ed332afea8ffbcdd49f0a873c 100644 (file)
--- a/main.go
+++ b/main.go
@@ -28,6 +28,7 @@ import (
        "path"
        "path/filepath"
        "strconv"
+       "strings"
 
        "go.cypherpunks.ru/recfile"
        "golang.org/x/sys/unix"
@@ -250,9 +251,8 @@ CmdSwitch:
                        break
                }
                os.Remove(fdTmp.Name())
-               var doFile string
                cwd, tgt := cwdAndTgt(tgts[0])
-               doFile, _, err = findDo(fdTmp, cwd, tgt)
+               doFile, upLevels, err := findDo(fdTmp, cwd, tgt)
                if err != nil {
                        break
                }
@@ -271,7 +271,11 @@ CmdSwitch:
                        }
                        fmt.Println(cwdMustRel(cwd, m["Target"]))
                }
-               ok = doFile != ""
+               if doFile == "" {
+                       ok = false
+               } else {
+                       fmt.Println(path.Join(strings.Repeat("..", upLevels), doFile))
+               }
        default:
                log.Fatalln("unknown command", cmdName)
        }