From e796780ae74b49e3a44ec2c20dfb3b22fa3c7916aa96d2e27937f5658eea2b6b Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 28 Aug 2022 13:26:37 +0300 Subject: [PATCH] Use database's directory for temporary files Not to manually alter TMPDIR for convenience. --- diff.go | 2 +- dirsizer.go | 2 +- index.go | 2 +- main.go | 10 ++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/diff.go b/diff.go index dda4fd9..31712d6 100644 --- a/diff.go +++ b/diff.go @@ -175,7 +175,7 @@ func updateWithDiff(dbPath, strip string) *os.File { if err != nil { log.Fatalln(err) } - tmp0, err := os.CreateTemp("", "glocate-idx") + tmp0, err := os.CreateTemp(TmpDir, "glocate-idx") if err != nil { log.Fatalln(err) } diff --git a/dirsizer.go b/dirsizer.go index fda37f4..18b705c 100644 --- a/dirsizer.go +++ b/dirsizer.go @@ -48,7 +48,7 @@ func applyDirSizes(src *os.File, dirSizes []int64) *os.File { if err != nil { log.Fatalln(err) } - tmp, err := os.CreateTemp("", "glocate-idx") + tmp, err := os.CreateTemp(TmpDir, "glocate-idx") if err != nil { log.Fatalln(err) } diff --git a/index.go b/index.go index c05e4c0..0445cee 100644 --- a/index.go +++ b/index.go @@ -7,7 +7,7 @@ import ( ) func index() *os.File { - tmp0, err := os.CreateTemp("", "glocate-idx") + tmp0, err := os.CreateTemp(TmpDir, "glocate-idx") if err != nil { log.Fatalln(err) } diff --git a/main.go b/main.go index affdffc..c18be44 100644 --- a/main.go +++ b/main.go @@ -5,10 +5,13 @@ import ( "log" "os" "path" + "path/filepath" "strings" "syscall" ) +var TmpDir string + type Ent struct { name []string mtime int64 @@ -41,6 +44,13 @@ func main() { flag.Parse() log.SetFlags(log.Ldate | log.Ltime | log.Lmicroseconds | log.Lshortfile) + var err error + TmpDir, err = filepath.Abs(*dbPath) + if err != nil { + panic(err) + } + TmpDir = path.Dir(TmpDir) + if *doIndex { tmp := index() tmp.Close() -- 2.44.0