DRY filepath.Abs/Rel

[goredo.git] / main.go

diff --git a/main.go b/main.go
index f6304aca8dd3b92c4d2a05bb77cc714ebd96842b..025ecbed5be4972146276c386d0fb14810de6975 100644 (file)
--- a/main.go
+++ b/main.go
@@ -148,10 +148,7 @@ func main() {
        if TopDir == "" {
                TopDir = "/"
        } else {
-               TopDir, err = filepath.Abs(TopDir)
-               if err != nil {
-                       panic(err)
-               }
+               TopDir = mustAbs(TopDir)
        }
        DirPrefix = os.Getenv(EnvDirPrefix)
        DepCwd = os.Getenv(EnvDepCwd)
@@ -432,10 +429,7 @@ CmdSwitch:
                                p = append(p, "..")
                        }
                        p = append(p, doFile)
-                       rel, err := filepath.Rel(Cwd, path.Join(p...))
-                       if err != nil {
-                               panic(err)
-                       }
+                       rel := mustRel(Cwd, path.Join(p...))
                        fmt.Println(rel)
                }
        case CmdNameRedoTargets: