commit 0a2c01636938a29eea60d78e2f9aa50c5ad22007
parent 3afcc98cefdb6eccd6d9e11f59f2d628ba66c29b
Author: Sean Enck <sean@ttypty.com>
Date: Tue, 11 Oct 2022 19:13:46 -0400
cleaning up env variables
Diffstat:
2 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/internal/inputs/env.go b/internal/inputs/env.go
@@ -40,10 +40,19 @@ const (
// ClipCopyEnv allows overriding the clipboard copy command
ClipCopyEnv = clipBaseEnv + "COPY"
// DefaultsCommand will get the environment values WITHOUT current environment settings
- DefaultsCommand = "-defaults"
- isYes = "yes"
- isNo = "no"
- defaultTOTPField = "totp"
+ DefaultsCommand = "-defaults"
+ isYes = "yes"
+ isNo = "no"
+ defaultTOTPField = "totp"
+ commandArgsExample = "[cmd args...]"
+ // MacOSPlatform is the macos indicator for platform
+ MacOSPlatform = "macos"
+ // LinuxWaylandPlatform for linux+wayland
+ LinuxWaylandPlatform = "linux-wayland"
+ // LinuxXPlatform for linux+X
+ LinuxXPlatform = "linux-x"
+ // WindowsLinuxPlatform for WSL subsystems
+ WindowsLinuxPlatform = "wsl"
)
var (
@@ -178,7 +187,7 @@ func (o environmentOutput) printEnvironmentVariable(required bool, name, val, de
if len(value) == 0 {
value = "(unset)"
}
- fmt.Printf("\n%s\n %s\n\n required: %t\n value: %s\n", name, desc, required, value)
+ fmt.Printf("\n%s\n %s\n\n required: %t\n value: %s\n options: %s\n", name, desc, required, value, strings.Join(allowed, "|"))
}
// ListEnvironmentVariables will print information about env variables and potential/set values
@@ -197,19 +206,19 @@ func ListEnvironmentVariables(args []string) error {
return errors.New("too many arguments")
}
e := environmentOutput{showValues: showValues}
- e.printEnvironmentVariable(true, StoreEnv, "", "directory to the database file", nil)
+ e.printEnvironmentVariable(true, StoreEnv, "", "directory to the database file", []string{"file"})
e.printEnvironmentVariable(true, keyModeEnv, commandKeyMode, "how to retrieve the database store password", []string{commandKeyMode, plainKeyMode})
- e.printEnvironmentVariable(true, keyEnv, "unset", fmt.Sprintf("the database key (%s) or shell command to run (%s) to retrieve the database password", plainKeyMode, commandKeyMode), nil)
+ e.printEnvironmentVariable(true, keyEnv, "unset", fmt.Sprintf("the database key (%s) or shell command to run (%s) to retrieve the database password", plainKeyMode, commandKeyMode), []string{commandArgsExample, "password"})
e.printEnvironmentVariable(false, noClipEnv, isNo, "disable clipboard operations", isYesNoArgs)
e.printEnvironmentVariable(false, noColorEnv, isNo, "disable terminal colors", isYesNoArgs)
e.printEnvironmentVariable(false, interactiveEnv, isYes, "enable interactive mode", isYesNoArgs)
e.printEnvironmentVariable(false, readOnlyEnv, isNo, "operate in readonly mode", isYesNoArgs)
- e.printEnvironmentVariable(false, fieldTOTPEnv, defaultTOTPField, "attribute name to store TOTP tokens within the database", nil)
- e.printEnvironmentVariable(false, formatTOTPEnv, "", "override the otpauth url used to store totp tokens (e.g. otpauth://totp/%s/rest/of/string), must have ONE format '%s' to insert the totp base code", nil)
- e.printEnvironmentVariable(false, ColorBetweenEnv, "", "override when to set totp generated outputs to different colors (e.g. 0:5,30:35), must be a list of one (or more) rules where a semicolon delimits the start and end second (0-60 for each)", nil)
- e.printEnvironmentVariable(false, ClipPasteEnv, "", "override the detected platform paste command", nil)
- e.printEnvironmentVariable(false, ClipPasteEnv, "", "override the detected platform copy command", nil)
- e.printEnvironmentVariable(false, ClipMaxEnv, "", "override the amount of time before totp clears the clipboard (e.g. 10), must be an integer", nil)
- e.printEnvironmentVariable(false, PlatformEnv, "", "override the detected platform", nil)
+ e.printEnvironmentVariable(false, fieldTOTPEnv, defaultTOTPField, "attribute name to store TOTP tokens within the database", []string{"string"})
+ e.printEnvironmentVariable(false, formatTOTPEnv, "", "override the otpauth url used to store totp tokens (e.g. otpauth://totp/%s/rest/of/string), must have ONE format '%s' to insert the totp base code", []string{"otpauth//url/%s/args..."})
+ e.printEnvironmentVariable(false, ColorBetweenEnv, "", "override when to set totp generated outputs to different colors (e.g. 0:5,30:35), must be a list of one (or more) rules where a semicolon delimits the start and end second (0-60 for each)", []string{"start:end,start:end,start:end..."})
+ e.printEnvironmentVariable(false, ClipPasteEnv, "", "override the detected platform paste command", []string{commandArgsExample})
+ e.printEnvironmentVariable(false, ClipPasteEnv, "", "override the detected platform copy command", []string{commandArgsExample})
+ e.printEnvironmentVariable(false, ClipMaxEnv, "", "override the amount of time before totp clears the clipboard (e.g. 10), must be an integer", []string{"integer"})
+ e.printEnvironmentVariable(false, PlatformEnv, "", "override the detected platform", []string{MacOSPlatform, LinuxWaylandPlatform, LinuxXPlatform, WindowsLinuxPlatform})
return nil
}
diff --git a/internal/platform/core.go b/internal/platform/core.go
@@ -17,13 +17,13 @@ type (
const (
// MacOS based systems.
- MacOS System = "macos"
+ MacOS System = inputs.MacOSPlatform
// LinuxWayland running Wayland.
- LinuxWayland System = "linux-wayland"
+ LinuxWayland System = inputs.LinuxWaylandPlatform
// LinuxX running X.
- LinuxX System = "linux-x"
+ LinuxX System = inputs.LinuxXPlatform
// WindowsLinux with WSL.
- WindowsLinux System = "wsl"
+ WindowsLinux System = inputs.WindowsLinuxPlatform
// Unknown platform.
Unknown = ""
)
