diff --git a/src/backend/configParser.go b/src/backend/configParser.go index 9492ccd..a4ae6a0 100644 --- a/src/backend/configParser.go +++ b/src/backend/configParser.go @@ -66,11 +66,6 @@ func WriteConfig(configFileMap map[string]string, append bool) { // create LIBMUTTON section libmuttonSection, _ = cfg.NewSection("LIBMUTTON") - - // set default textEditor value - if configFileMap["textEditor"] == "" { - configFileMap["textEditor"] = textEditorFallback() - } } // write provided configFileMap key-value pairs to the LIBMUTTON section diff --git a/src/cli/init.go b/src/cli/init.go index 96680c9..88e4ef2 100644 --- a/src/cli/init.go +++ b/src/cli/init.go @@ -27,7 +27,10 @@ func TempInitCli() { } // textEditor - textEditor := input("Text editor (leave blank for $EDITOR, falls back to \"" + backend.FallbackEditor + "\"):") + textEditor := input("Text editor (leave blank for $EDITOR, falls back to \"" + fallbackEditor + "\"):") + if textEditor == "" { + textEditor = textEditorFallback() + } // SSH info configSSH := inputBinary("Configure SSH settings (for synchronization)?") diff --git a/src/backend/initUNIX.go b/src/cli/initUNIX.go similarity index 73% rename from src/backend/initUNIX.go rename to src/cli/initUNIX.go index 7540b0c..1c63fb5 100644 --- a/src/backend/initUNIX.go +++ b/src/cli/initUNIX.go @@ -1,19 +1,19 @@ //go:build !windows -package backend +package cli import ( "os" ) -const FallbackEditor = "vi" // vi is pre-installed on most UNIX systems +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 { // ensure textEditor is set textEditor := os.Getenv("EDITOR") if textEditor == "" { - textEditor = FallbackEditor + textEditor = fallbackEditor } return textEditor } diff --git a/src/backend/initWIN.go b/src/cli/initWIN.go similarity index 60% rename from src/backend/initWIN.go rename to src/cli/initWIN.go index 070f6a1..746789c 100644 --- a/src/backend/initWIN.go +++ b/src/cli/initWIN.go @@ -1,10 +1,10 @@ //go:build windows -package backend +package cli -const FallbackEditor = "nvim" // since there is no pre-installed CLI editor on Windows, default to the most popular one +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 + return fallbackEditor }