fix(vfox curTmpPath): reuse temporary directories across days

fix: version-fox#313
jan-bar · Jun 25, 2024 · ca9f722 · ca9f722
1 parent d3d731c
commit ca9f722
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/cmd/commands/activate.go b/cmd/commands/activate.go
@@ -82,6 +82,7 @@ func activateCmd(ctx *cli.Context) error {
 	osPaths := env.NewPaths(env.OsPaths)
 	pathsStr := envKeys.Paths.Merge(osPaths).String()
 	exportEnvs["PATH"] = &pathsStr
+	exportEnvs[internal.HookCurTmpPath] = &manager.PathMeta.CurTmpPath
 
 	path := manager.PathMeta.ExecutablePath
 	path = strings.Replace(path, "\\", "/", -1)

diff --git a/internal/path.go b/internal/path.go
@@ -37,6 +37,10 @@ type PathMeta struct {
 	GlobalShimsPath  string
 }
 
+const (
+	HookCurTmpPath = "__VFOX_CURTMPPATH"
+)
+
 func newPathMeta() (*PathMeta, error) {
 	userHomeDir, err := os.UserHomeDir()
 	if err != nil {
@@ -53,10 +57,13 @@ func newPathMeta() (*PathMeta, error) {
 	if err != nil {
 		return nil, err
 	}
-	pid := env.GetPid()
-	timestamp := util.GetBeginOfToday()
-	name := fmt.Sprintf("%d-%d", timestamp, pid)
-	curTmpPath := filepath.Join(tmpPath, name)
+	curTmpPath := os.Getenv(HookCurTmpPath)
+	if curTmpPath == "" {
+		pid := env.GetPid()
+		timestamp := util.GetBeginOfToday()
+		name := fmt.Sprintf("%d-%d", timestamp, pid)
+		curTmpPath = filepath.Join(tmpPath, name)
+	}
 	if !util.FileExists(curTmpPath) {
 		err = os.Mkdir(curTmpPath, 0755)
 		if err != nil {