X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=cleanup.go;h=61f028f2d56dc6d600a1146ff1ac7d640f5cef56;hb=ce96a1c785b32af13264225c0bf7ae8370a5af21;hp=bb9564cdc43285bd97472774693771bbd5feef04;hpb=67e92d5a298516292bbbee1f7714708cdc0766f8;p=goredo.git

diff --git a/cleanup.go b/cleanup.go
index bb9564c..61f028f 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,10 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+	"flag"
 	"fmt"
 	"io"
 	"log"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 )
@@ -32,6 +34,10 @@ const (
 	CleanupTmp  = "tmp"
 )
 
+var (
+	DryRun = flag.Bool("dry-run", false, "do no delete files during cleanup, just show them")
+)
+
 func redoDirClean(root, what string) error {
 	root, err := filepath.Abs(root)
 	if err != nil {
@@ -56,15 +62,19 @@ func redoDirClean(root, what string) error {
 			case CleanupLog:
 				if strings.HasSuffix(fi.Name(), LogSuffix) {
 					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:
@@ -93,14 +103,16 @@ func cleanupWalker(root, what string) error {
 			}
 			return err
 		}
-		var pth string
 		for _, fi := range fis {
-			pth = cwdMustRel(root, fi.Name())
+			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)
 					}
@@ -114,9 +126,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
+					}
 				}
 			}
 		}