DRY filepath.Abs/Rel

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index 88e2215d89d498c2e0a8d9d8d31ee0f231d73f9a..9792cb0bbcd5b40a6289cdcdccc109ffd6fd7b92 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -26,7 +26,6 @@ import (
        "io"
        "os"
        "path"
-       "path/filepath"
 
        "go.cypherpunks.ru/recfile"
        "lukechampine.com/blake3"
@@ -124,20 +123,15 @@ func depsWrite(fdDep *os.File, tgts []string) error {
                tracef(CDebug, "no opened fdDep: %s", tgts)
                return nil
        }
+       var err error
        for _, tgt := range tgts {
-               tgtAbs, err := filepath.Abs(tgt)
-               if err != nil {
-                       panic(err)
-               }
+               tgtAbs := mustAbs(tgt)
                cwd := Cwd
                if DepCwd != "" && Cwd != DepCwd {
                        cwd = DepCwd
                }
                tgtDir := path.Join(cwd, DirPrefix)
-               tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
-               if err != nil {
-                       panic(err)
-               }
+               tgtRel := mustRel(tgtDir, tgtAbs)
                if _, errStat := os.Stat(tgt); errStat == nil {
                        err = ErrLine(depWrite(fdDep, tgtDir, tgtRel, ""))
                } else {