dont prompt to update if not a tty

humanlogio · Jan 15, 2023 · d6dcf3b · d6dcf3b
1 parent 6c19b32
commit d6dcf3b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/cmd/humanlog/main.go b/cmd/humanlog/main.go
@@ -207,8 +207,10 @@ func newApp() *cli.App {
 
 		if shouldCheckForUpdate(c, cfg, statefile) {
 			if statefile.LatestKnownVersion != nil && statefile.LatestKnownVersion.GT(semverVersion) {
-				promptToUpdate(semverVersion, *statefile.LatestKnownVersion)
 				promptedToUpdate = statefile.LatestKnownVersion
+				if shouldPromptAboutUpdate() {
+					promptToUpdate(semverVersion, *statefile.LatestKnownVersion)
+				}
 			}
 
 			req := &checkForUpdateReq{
@@ -230,7 +232,9 @@ func newApp() *cli.App {
 			if res.hasUpdate {
 				alreadyPromptedForSameUpdate := promptedToUpdate != nil && promptedToUpdate.GTE(res.sem)
 				if !alreadyPromptedForSameUpdate {
-					promptToUpdate(semverVersion, res.sem)
+					if shouldPromptAboutUpdate() {
+						promptToUpdate(semverVersion, res.sem)
+					}
 				}
 			}
 		default:

diff --git a/cmd/humanlog/versions.go b/cmd/humanlog/versions.go
@@ -31,11 +31,15 @@ func shouldCheckForUpdate(cctx *cli.Context, cfg *config.Config, state *state.St
 	if cctx.Args().First() == versionCmdName {
 		return false // check is done already
 	}
-	if !isTerminal(os.Stderr) || !isTerminal(os.Stdout) {
-		// not in interactive mode
+	if cfg.SkipCheckForUpdates != nil && *cfg.SkipCheckForUpdates {
 		return false
 	}
-	if cfg.SkipCheckForUpdates != nil && *cfg.SkipCheckForUpdates {
+	return true
+}
+
+func shouldPromptAboutUpdate() bool {
+	if !isTerminal(os.Stderr) || !isTerminal(os.Stdout) {
+		// not in interactive mode
 		return false
 	}
 	return true