From 1e5c0feabaa5bd5037508f65b9dde44d83482b97 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Wed, 17 Jul 2024 17:26:01 -0400
Subject: [PATCH] Simplify text editor fallback

---
 src/cli/init.go     |  6 ++----
 src/cli/initUNIX.go | 15 +--------------
 src/cli/initWIN.go  |  5 -----
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/cli/init.go b/src/cli/init.go
index df02958..e3beca8 100644
--- a/src/cli/init.go
+++ b/src/cli/init.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"cmp"
 	"fmt"
 	"os"
 	"strconv"
@@ -27,10 +28,7 @@ func TempInitCli() {
 	}
 
 	// textEditor
-	textEditor := input("Text editor (leave blank for $EDITOR, falls back to \"" + fallbackEditor + "\"):")
-	if textEditor == "" {
-		textEditor = textEditorFallback()
-	}
+	textEditor := cmp.Or(input("Text editor (leave blank for $EDITOR, falls back to \""+fallbackEditor+"\"):"), os.Getenv("EDITOR"), fallbackEditor)
 
 	// SSH info
 	configSSH := inputBinary("Configure SSH settings (for synchronization)?")
diff --git a/src/cli/initUNIX.go b/src/cli/initUNIX.go
index e79bdad..0712ed1 100644
--- a/src/cli/initUNIX.go
+++ b/src/cli/initUNIX.go
@@ -2,17 +2,4 @@
 
 package cli
 
-import (
-	"os"
-)
-
-const fallbackEditor = "vi" // vi is pre-installed on most UNIX systems
-
-// textEditorFallback returns the value of the $EDITOR environment variable, or FallbackEditor if it is not set
-func textEditorFallback() string {
-	textEditor := os.Getenv("EDITOR")
-	if textEditor == "" {
-		textEditor = fallbackEditor
-	}
-	return textEditor
-}
+const fallbackEditor = "vi" // vi is pre-installed on most UNIX-like systems
diff --git a/src/cli/initWIN.go b/src/cli/initWIN.go
index 746789c..cc45383 100644
--- a/src/cli/initWIN.go
+++ b/src/cli/initWIN.go
@@ -3,8 +3,3 @@
 package cli
 
 const fallbackEditor = "nvim" // since there is no pre-installed CLI editor on Windows, default to the most popular one
-
-// textEditorFallback returns FallbackEditor
-func textEditorFallback() string {
-	return fallbackEditor
-}