Skip to content

Commit eefa956

Browse files
committedSep 13, 2023
feat: flags are now all dashes
1 parent a79040e commit eefa956

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed
 

‎cmd/smtpbridge/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func main() {
3838
flags := config.WithFlagSet(flag.NewFlagSet(os.Args[0], flag.ExitOnError))
3939

4040
app := lieut.NewSingleCommandApp(
41-
lieut.AppInfo{Name: "smtpbridge", Version: build.Current.Version},
41+
lieut.AppInfo{Name: "smtpbridge", Version: build.Current.Version, Summary: "Bridge email to other messaging services."},
4242
run(flags),
4343
flags,
4444
os.Stdout,

‎config/config.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,17 @@ var RawDefault = struct {
115115
// IMAPPort: 10143,
116116
}
117117

118+
var flagFlatKeys map[string]string = map[string]string{
119+
"time-format": "time_format",
120+
"data-directory": "data_directory",
121+
"python-executable": "python_executable",
122+
}
123+
118124
func WithFlagSet(flags *flag.FlagSet) *flag.FlagSet {
119125
flags.String("config", "", flagUsageString("", "Path to config file."))
120-
flags.String("time_format", "", flagUsageString(TimeFormat12H, fmt.Sprintf("Format for time display (%s/%s).", TimeFormat12H, TimeFormat24H)))
121-
flags.String("data_directory", "", flagUsageString(RawDefault.DataDirectory, "Path to data directory."))
122-
flags.String("python_executable", "", flagUsageString(RawDefault.PythonExecutable, "Python executable."))
126+
flags.String("time-format", "", flagUsageString(TimeFormat12H, fmt.Sprintf("Format for time display (%s/%s).", TimeFormat12H, TimeFormat24H)))
127+
flags.String("data-directory", "", flagUsageString(RawDefault.DataDirectory, "Path to data directory."))
128+
flags.String("python-executable", "", flagUsageString(RawDefault.PythonExecutable, "Python executable."))
123129
flags.Bool("debug", false, flagUsageBool(false, "Run in debug mode."))
124130

125131
flags.Bool("smtp-disable", false, flagUsageBool(false, "Disable SMTP server."))
@@ -359,6 +365,9 @@ func NewParser(flags *flag.FlagSet) (Parser, error) {
359365
if value == "" || value == "0" || value == "false" {
360366
return "", nil
361367
}
368+
if remap, ok := flagFlatKeys[key]; ok {
369+
return remap, ok
370+
}
362371
return key, value
363372
}), nil)
364373

‎entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ if [ -n "$APPRISE_ENABLE" ]; then
1010
fi
1111
fi
1212

13-
/usr/bin/smtpbridge --data_directory=/data
13+
/usr/bin/smtpbridge --data-directory=/data

0 commit comments

Comments
 (0)
Please sign in to comment.