]> Sergey Matveev's repositories - glocate.git/commitdiff
Use database's directory for temporary files
authorSergey Matveev <stargrave@stargrave.org>
Sun, 28 Aug 2022 10:26:37 +0000 (13:26 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sun, 28 Aug 2022 10:26:39 +0000 (13:26 +0300)
Not to manually alter TMPDIR for convenience.

diff.go
dirsizer.go
index.go
main.go

diff --git a/diff.go b/diff.go
index dda4fd9ded52ee8109d30cbf1974527600de590be43819023d0df4ab8fbb91f4..31712d63aaff055dea895b639dbc85323a6ab1e46d393ae7a232f2a4b80d9f1d 100644 (file)
--- 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)
        }
index fda37f4fe46098cf687690e5e03984aba77f952ed5814359e94deefcccbbbdb3..18b705c6cf16f41827449d4dadb422f06c39501a55c567042a6a435cab026ba6 100644 (file)
@@ -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)
        }
index c05e4c0b84d35c2d6d49beede0faf14c8f985fd98f2d42c1bf11a336f2f49381..0445ceecdeb6a35354279576b0543f22714fb34c814e4651def64740703725f5 100644 (file)
--- 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 affdffc8d95d0c7179d7cc9359c524cb8f963669053a888a9da1f6d8b3e237e5..c18be4409d252ffa15b06e852f3a9f8b23fcf6339038057ae82c20a429f934bd 100644 (file)
--- 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()