enable version subcmd and --version flag for root cmd and all subcmds
parent
ef56112711
commit
b4708348c6
|
@ -11,10 +11,11 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var cmdsCmd = &cobra.Command{
|
var cmdsCmd = &cobra.Command{
|
||||||
Use: "cmds",
|
Use: "cmds",
|
||||||
Short: "Command runner management utility",
|
Version: rootCmd.Version,
|
||||||
Long: `Command runner management utility.`,
|
Short: "Command runner management utility",
|
||||||
Args: cobra.NoArgs,
|
Long: `Command runner management utility.`,
|
||||||
|
Args: cobra.NoArgs,
|
||||||
}
|
}
|
||||||
|
|
||||||
func printEvents(m map[string][]string) {
|
func printEvents(m map[string][]string) {
|
||||||
|
|
|
@ -20,10 +20,11 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var configCmd = &cobra.Command{
|
var configCmd = &cobra.Command{
|
||||||
Use: "config",
|
Use: "config",
|
||||||
Short: "Configuration management utility",
|
Version: rootCmd.Version,
|
||||||
Long: `Configuration management utility.`,
|
Short: "Configuration management utility",
|
||||||
Args: cobra.NoArgs,
|
Long: `Configuration management utility.`,
|
||||||
|
Args: cobra.NoArgs,
|
||||||
}
|
}
|
||||||
|
|
||||||
func addConfigFlags(flags *pflag.FlagSet) {
|
func addConfigFlags(flags *pflag.FlagSet) {
|
||||||
|
|
|
@ -12,10 +12,11 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var hashCmd = &cobra.Command{
|
var hashCmd = &cobra.Command{
|
||||||
Use: "hash <password>",
|
Use: "hash <password>",
|
||||||
Short: "Hashes a password",
|
Version: rootCmd.Version,
|
||||||
Long: `Hashes a password using bcrypt algorithm.`,
|
Short: "Hashes a password",
|
||||||
Args: cobra.ExactArgs(1),
|
Long: `Hashes a password using bcrypt algorithm.`,
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
pwd, err := users.HashPwd(args[0])
|
pwd, err := users.HashPwd(args[0])
|
||||||
checkErr(err)
|
checkErr(err)
|
||||||
|
|
13
cmd/root.go
13
cmd/root.go
|
@ -16,7 +16,8 @@ import (
|
||||||
"github.com/filebrowser/filebrowser/v2/settings"
|
"github.com/filebrowser/filebrowser/v2/settings"
|
||||||
"github.com/filebrowser/filebrowser/v2/storage"
|
"github.com/filebrowser/filebrowser/v2/storage"
|
||||||
"github.com/filebrowser/filebrowser/v2/users"
|
"github.com/filebrowser/filebrowser/v2/users"
|
||||||
"github.com/mitchellh/go-homedir"
|
"github.com/filebrowser/filebrowser/v2/version"
|
||||||
|
homedir "github.com/mitchellh/go-homedir"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
v "github.com/spf13/viper"
|
v "github.com/spf13/viper"
|
||||||
|
@ -29,6 +30,9 @@ var (
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
cobra.OnInitialize(initConfig)
|
cobra.OnInitialize(initConfig)
|
||||||
|
|
||||||
|
rootCmd.SetVersionTemplate("File Browser version {{printf \"%s\" .Version}}\n")
|
||||||
|
|
||||||
flags := rootCmd.Flags()
|
flags := rootCmd.Flags()
|
||||||
persistent := rootCmd.PersistentFlags()
|
persistent := rootCmd.PersistentFlags()
|
||||||
|
|
||||||
|
@ -87,12 +91,13 @@ func mustGetStringViperFlag(flags *pflag.FlagSet, key string) string {
|
||||||
}
|
}
|
||||||
|
|
||||||
var rootCmd = &cobra.Command{
|
var rootCmd = &cobra.Command{
|
||||||
Use: "filebrowser",
|
Use: "filebrowser",
|
||||||
Short: "A stylish web-based file browser",
|
Short: "A stylish web-based file browser",
|
||||||
|
Version: version.Version,
|
||||||
Long: `File Browser CLI lets you create the database to use with File Browser,
|
Long: `File Browser CLI lets you create the database to use with File Browser,
|
||||||
manage your users and all the configurations without acessing the
|
manage your users and all the configurations without acessing the
|
||||||
web interface.
|
web interface.
|
||||||
|
|
||||||
If you've never run File Browser, you'll need to have a database for
|
If you've never run File Browser, you'll need to have a database for
|
||||||
it. Don't worry: you don't need to setup a separate database server.
|
it. Don't worry: you don't need to setup a separate database server.
|
||||||
We're using Bolt DB which is a single file database and all managed
|
We're using Bolt DB which is a single file database and all managed
|
||||||
|
|
|
@ -18,8 +18,9 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var rulesCmd = &cobra.Command{
|
var rulesCmd = &cobra.Command{
|
||||||
Use: "rules",
|
Use: "rules",
|
||||||
Short: "Rules management utility",
|
Version: rootCmd.Version,
|
||||||
|
Short: "Rules management utility",
|
||||||
Long: `On each subcommand you'll have available at least two flags:
|
Long: `On each subcommand you'll have available at least two flags:
|
||||||
"username" and "id". You must either set only one of them
|
"username" and "id". You must either set only one of them
|
||||||
or none. If you set one of them, the command will apply to
|
or none. If you set one of them, the command will apply to
|
||||||
|
|
|
@ -14,8 +14,9 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var upgradeCmd = &cobra.Command{
|
var upgradeCmd = &cobra.Command{
|
||||||
Use: "upgrade",
|
Use: "upgrade",
|
||||||
Short: "Upgrades an old configuration",
|
Version: rootCmd.Version,
|
||||||
|
Short: "Upgrades an old configuration",
|
||||||
Long: `Upgrades an old configuration. This command DOES NOT
|
Long: `Upgrades an old configuration. This command DOES NOT
|
||||||
import share links because they are incompatible with
|
import share links because they are incompatible with
|
||||||
this version.`,
|
this version.`,
|
||||||
|
|
|
@ -18,10 +18,11 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var usersCmd = &cobra.Command{
|
var usersCmd = &cobra.Command{
|
||||||
Use: "users",
|
Use: "users",
|
||||||
Short: "Users management utility",
|
Version: rootCmd.Version,
|
||||||
Long: `Users management utility.`,
|
Short: "Users management utility",
|
||||||
Args: cobra.NoArgs,
|
Long: `Users management utility.`,
|
||||||
|
Args: cobra.NoArgs,
|
||||||
}
|
}
|
||||||
|
|
||||||
func printUsers(users []*users.User) {
|
func printUsers(users []*users.User) {
|
||||||
|
|
|
@ -1,20 +1,32 @@
|
||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"text/template"
|
||||||
|
|
||||||
"github.com/filebrowser/filebrowser/v2/version"
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
rootCmd.AddCommand(versionCmd)
|
rootCmd.AddCommand(versionCmd)
|
||||||
|
cmdsCmd.AddCommand(versionCmd)
|
||||||
|
configCmd.AddCommand(versionCmd)
|
||||||
|
hashCmd.AddCommand(versionCmd)
|
||||||
|
upgradeCmd.AddCommand(versionCmd)
|
||||||
|
rulesCmd.AddCommand(versionCmd)
|
||||||
|
usersCmd.AddCommand(versionCmd)
|
||||||
}
|
}
|
||||||
|
|
||||||
var versionCmd = &cobra.Command{
|
var versionCmd = &cobra.Command{
|
||||||
Use: "version",
|
Use: "version",
|
||||||
Short: "Print the version number",
|
Short: "Print the version number of File Browser",
|
||||||
|
Long: `All software has versions. This is File Browser's`,
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
fmt.Println("File Browser Version " + version.Version)
|
// https://github.com/spf13/cobra/issues/724
|
||||||
|
t := template.New("version")
|
||||||
|
template.Must(t.Parse(rootCmd.VersionTemplate()))
|
||||||
|
err := t.Execute(rootCmd.OutOrStdout(), rootCmd)
|
||||||
|
if err != nil {
|
||||||
|
rootCmd.Println(err)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue