record path of statefile when default one is created initially

humanlogio · Jan 14, 2023 · 425cd4b · 425cd4b
1 parent 01f8a03
commit 425cd4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/humanlog/main.go b/cmd/humanlog/main.go
@@ -227,7 +227,7 @@ func newApp() *cli.App {
 			if !ok {
 				return nil
 			}
-			if res.hasUpdate && promptedToUpdate == nil && promptedToUpdate.LT(res.sem) {
+			if res.hasUpdate && promptedToUpdate == nil || promptedToUpdate.LT(res.sem) {
 				alreadyPromptedForSameUpdate := promptedToUpdate != nil && promptedToUpdate.GTE(res.sem)
 				if !alreadyPromptedForSameUpdate {
 					promptToUpdate(semverVersion, res.sem)

diff --git a/internal/pkg/state/state.go b/internal/pkg/state/state.go
@@ -51,7 +51,8 @@ func ReadStateFile(path string, dflt *State) (*State, error) {
 		if !errors.Is(err, os.ErrNotExist) {
 			return nil, fmt.Errorf("opening state file %q: %v", path, err)
 		}
-		return dflt, WriteStateFile(path, dflt)
+		cfg := (State{path: path}).populateEmpty(dflt)
+		return cfg, WriteStateFile(path, cfg)
 	}
 	defer stateFile.Close()
 	var cfg State
@@ -67,7 +68,6 @@ func WriteStateFile(path string, state *State) error {
 	if err != nil {
 		return fmt.Errorf("marshaling state file: %v", err)
 	}
-
 	newf, err := os.CreateTemp(os.TempDir(), "humanlog_statefile")
 	if err != nil {
 		return fmt.Errorf("creating temporary file for statefile: %w", err)
@@ -88,7 +88,7 @@ func WriteStateFile(path string, state *State) error {
 		return fmt.Errorf("setting permissions on temporary statefile: %w", err)
 	}
 	if err := os.Rename(newf.Name(), path); err != nil {
-		return fmt.Errorf("replacing statefile: %w", err)
+		return fmt.Errorf("replacing statefile at %q with %q: %w", path, newf.Name(), err)
 	}
 	success = true
 	return nil