X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=cleanup.go;h=f75788aae270780f69df8b567fad0c40ab5df6fb;hb=407dbee34b6f748c662e8dc58efc3a2d0e273c58;hp=a98510d1ec4d7763913310cd194484decce9ea68;hpb=f15fe27971bcf37a06bb9542ea1907f11444515a;p=goredo.git

diff --git a/cleanup.go b/cleanup.go
index a98510d..f75788a 100644
--- a/cleanup.go
+++ b/cleanup.go
@@ -1,6 +1,6 @@
 /*
 goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -52,10 +52,7 @@ func redoDirClean(root, what string) error {
 		}
 		var pth string
 		for _, fi := range fis {
-			pth, err = filepath.Rel(Cwd, path.Join(root, fi.Name()))
-			if err != nil {
-				panic(err)
-			}
+			pth = cwdMustRel(root, fi.Name())
 			switch what {
 			case CleanupLog:
 				if strings.HasSuffix(fi.Name(), LogSuffix) {
@@ -97,16 +94,13 @@ func cleanupWalker(root, what string) error {
 			}
 			return err
 		}
-		var pth string
 		for _, fi := range fis {
-			pth, err = filepath.Rel(Cwd, path.Join(root, fi.Name()))
-			if err != nil {
-				panic(err)
-			}
+			pth := path.Join(root, fi.Name())
+			pthRel := cwdMustRel(root, fi.Name())
 			if fi.IsDir() {
 				if fi.Name() == RedoDir {
 					if what == CleanupFull {
-						fmt.Println(pth)
+						fmt.Println(pthRel)
 						err = os.RemoveAll(pth)
 					} else {
 						err = redoDirClean(pth, what)
@@ -121,7 +115,7 @@ func cleanupWalker(root, what string) error {
 			}
 			if (what == CleanupTmp || what == CleanupFull) &&
 				strings.HasPrefix(fi.Name(), TmpPrefix) {
-				fmt.Println(pth)
+				fmt.Println(pthRel)
 				if err = os.Remove(pth); err != nil {
 					return err
 				}