Fix --short not working correctly

This commit is contained in:
Patrick Pacher 2020-07-22 16:12:26 +02:00
parent 81c6ed2906
commit 8754eabfe0
No known key found for this signature in database
GPG key ID: E8CD2DA160925A6D

View file

@ -33,6 +33,7 @@ var versionCmd = &cobra.Command{
if !showAllVersions { if !showAllVersions {
if showShortVersion { if showShortVersion {
fmt.Println(info.Version()) fmt.Println(info.Version())
return nil
} }
fmt.Println(info.FullVersion()) fmt.Println(info.FullVersion())
@ -40,7 +41,7 @@ var versionCmd = &cobra.Command{
} }
fmt.Printf("portmaster-start %s\n\n", info.Version()) fmt.Printf("portmaster-start %s\n\n", info.Version())
fmt.Printf("Components:\n") fmt.Printf("Assets:\n")
all := registry.Export() all := registry.Export()
keys := make([]string, 0, len(all)) keys := make([]string, 0, len(all))
@ -72,7 +73,7 @@ func init() {
flags := versionCmd.Flags() flags := versionCmd.Flags()
{ {
flags.BoolVar(&showShortVersion, "short", false, "Print only the version number.") flags.BoolVar(&showShortVersion, "short", false, "Print only the version number.")
flags.BoolVar(&showAllVersions, "all", false, "Dump versions for all components.") flags.BoolVar(&showAllVersions, "all", false, "Dump versions for all assets.")
} }
rootCmd.AddCommand(versionCmd) rootCmd.AddCommand(versionCmd)