From f10aadb2675b26d351365c6c208c930b6d4c619c Mon Sep 17 00:00:00 2001 From: Joseph Richey Date: Mon, 23 Mar 2020 14:24:48 -0700 Subject: 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 --- cmd/fscrypt/strings.go | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'cmd/fscrypt/strings.go') 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. -- cgit v1.2.3