aboutsummaryrefslogtreecommitdiff
path: root/cmd/fscrypt
diff options
context:
space:
mode:
authorJoseph Richey <joerichey@google.com>2020-03-23 14:24:48 -0700
committerGitHub <noreply@github.com>2020-03-23 14:24:48 -0700
commitf10aadb2675b26d351365c6c208c930b6d4c619c (patch)
tree5a86d205de0e3ed6299942b21c1518a394f6b8d7 /cmd/fscrypt
parentab531eea551598170e4dd973fa5955f01b5c0318 (diff)
cmd: Simplify "fscrypt --version" output (#207)
There's no need to include the build time, author, and copyright info in the output of "fscrypt --version". This information is: - Overly complex (the current string is hard to parse) - Inaccurate (there are other authors than just me) - Unnecessary (the Apache 2 license is for Source Code) - Makes reproducible builds impossible The default version string is just fine. Signed-off-by: Joe Richey <joerichey@google.com>
Diffstat (limited to 'cmd/fscrypt')
-rw-r--r--cmd/fscrypt/flags.go2
-rw-r--r--cmd/fscrypt/fscrypt.go22
-rw-r--r--cmd/fscrypt/strings.go36
3 files changed, 5 insertions, 55 deletions
diff --git a/cmd/fscrypt/flags.go b/cmd/fscrypt/flags.go
index 9679a8d..cb2e0ac 100644
--- a/cmd/fscrypt/flags.go
+++ b/cmd/fscrypt/flags.go
@@ -129,7 +129,7 @@ var (
}
versionFlag = &boolFlag{
Name: "version",
- Usage: `Prints version and license information.`,
+ Usage: `Prints version information.`,
}
verboseFlag = &boolFlag{
Name: "verbose",
diff --git a/cmd/fscrypt/fscrypt.go b/cmd/fscrypt/fscrypt.go
index b6549f4..e260f7f 100644
--- a/cmd/fscrypt/fscrypt.go
+++ b/cmd/fscrypt/fscrypt.go
@@ -29,22 +29,12 @@ import (
"io/ioutil"
"log"
"os"
- "time"
"github.com/urfave/cli"
)
-var (
- // Current version of the program (set by Makefile)
- version string
- // Formatted build time (set by Makefile)
- buildTime string
- // Authors to display in the info command
- Authors = []cli.Author{{
- Name: "Joe Richey",
- Email: "joerichey@google.com",
- }}
-)
+// Current version of the program (set by Makefile)
+var version string
func main() {
cli.AppHelpTemplate = appHelpTemplate
@@ -54,20 +44,14 @@ func main() {
// Create our command line application
app := cli.NewApp()
app.Usage = shortUsage
- app.Authors = Authors
- app.Copyright = apache2GoogleCopyright
- // Grab the version and compilation time passed in from the Makefile.
+ // Grab the version passed in from the Makefile.
app.Version = version
- app.Compiled, _ = time.Parse(time.UnixDate, buildTime)
app.OnUsageError = onUsageError
// Setup global flags
cli.HelpFlag = helpFlag
cli.VersionFlag = versionFlag
- cli.VersionPrinter = func(c *cli.Context) {
- cli.HelpPrinter(c.App.Writer, versionInfoTemplate, c.App)
- }
app.Flags = universalFlags
// We hide the help subcommand so that "fscrypt <command> --help" works
diff --git a/cmd/fscrypt/strings.go b/cmd/fscrypt/strings.go
index adef81d..20abbf9 100644
--- a/cmd/fscrypt/strings.go
+++ b/cmd/fscrypt/strings.go
@@ -25,24 +25,7 @@ import (
"strings"
)
-// Global application strings
-const (
- shortUsage = "A tool for managing Linux filesystem encryption"
-
- apache2GoogleCopyright = `Copyright 2017 Google, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.`
-)
+const shortUsage = "A tool for managing Linux filesystem encryption"
// Argument usage strings
const (
@@ -103,23 +86,6 @@ Options:
{{range .VisibleFlags}}{{.}}
{{end}}{{end}}`
-
- // Additional info, used with "fscrypt version"
- versionInfoTemplate = `{{.HelpName}} - {{.Usage}}
-
-{{if .Version}}Version:
-` + indent + `{{.Version}}
-
-{{end}}{{if not .Compiled.IsZero}}Compiled:
-` + indent + `{{.Compiled}}
-
-{{end}}{{if len .Authors}}Author{{with $length := len .Authors}}{{if ne 1 $length}}s{{end}}{{end}}:{{range .Authors}}
-` + indent + `{{.}}{{end}}
-
-{{end}}{{if .Copyright}}Copyright:
-` + indent + `{{.Copyright}}
-
-{{end}}`
)
// Add words to this map to have pluralize support them.