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

diff --git a/cleanup.go b/cleanup.go
index a98510d..8c757ae 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>
+goredo -- djb's redo implementation on pure Go
+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
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+	"flag"
 	"fmt"
 	"io"
 	"log"
@@ -33,6 +34,15 @@ const (
 	CleanupTmp  = "tmp"
 )
 
+var DryRun *bool
+
+func init() {
+	if CmdName() != CmdNameRedoCleanup {
+		return
+	}
+	DryRun = flag.Bool("n", false, "do no delete files during cleanup, just show them")
+}
+
 func redoDirClean(root, what string) error {
 	root, err := filepath.Abs(root)
 	if err != nil {
@@ -52,23 +62,25 @@ 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) {
+				if strings.HasSuffix(fi.Name(), LogSuffix) ||
+					strings.HasSuffix(fi.Name(), LogRecSuffix) {
 					fmt.Println(pth)
-					if err = os.Remove(pth); err != nil {
-						return err
+					if !*DryRun {
+						if err = os.Remove(pth); err != nil {
+							return err
+						}
 					}
 				}
 			case CleanupTmp:
 				if strings.HasPrefix(fi.Name(), TmpPrefix) {
 					fmt.Println(pth)
-					if err = os.Remove(pth); err != nil {
-						return err
+					if !*DryRun {
+						if err = os.Remove(pth); err != nil {
+							return err
+						}
 					}
 				}
 			default:
@@ -97,17 +109,16 @@ 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)
-						err = os.RemoveAll(pth)
+						fmt.Println(pthRel)
+						if !*DryRun {
+							err = os.RemoveAll(pth)
+						}
 					} else {
 						err = redoDirClean(pth, what)
 					}
@@ -121,9 +132,11 @@ func cleanupWalker(root, what string) error {
 			}
 			if (what == CleanupTmp || what == CleanupFull) &&
 				strings.HasPrefix(fi.Name(), TmpPrefix) {
-				fmt.Println(pth)
-				if err = os.Remove(pth); err != nil {
-					return err
+				fmt.Println(pthRel)
+				if !*DryRun {
+					if err = os.Remove(pth); err != nil {
+						return err
+					}
 				}
 			}
 		}