Skip to content

Commit

Permalink
Refactor cmdVersion to cli package
Browse files Browse the repository at this point in the history
  • Loading branch information
ohdearaugustin committed Jul 25, 2021
1 parent 5f60671 commit 48ec51d
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 18 deletions.
23 changes: 23 additions & 0 deletions cmd/headscale/cli/version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package cli

import (
"fmt"
"github.com/spf13/cobra"
"strings"
)

var version = "dev"

var VersionCmd = &cobra.Command{
Use: "version",
Short: "Print the version.",
Long: "The version of headscale.",
Run: func(cmd *cobra.Command, args []string) {
o, _ := cmd.Flags().GetString("output")
if strings.HasPrefix(o, "json") {
JsonOutput(map[string]string{"version": version}, nil, o)
return
}
fmt.Println(version)
},
}
19 changes: 1 addition & 18 deletions cmd/headscale/headscale.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,11 @@ import (
"fmt"
"log"
"os"
"strings"

"github.com/juanfont/headscale/cmd/headscale/cli"
"github.com/spf13/cobra"
)

var version = "dev"

var versionCmd = &cobra.Command{
Use: "version",
Short: "Print the version.",
Long: "The version of headscale.",
Run: func(cmd *cobra.Command, args []string) {
o, _ := cmd.Flags().GetString("output")
if strings.HasPrefix(o, "json") {
cli.JsonOutput(map[string]string{"version": version}, nil, o)
return
}
fmt.Println(version)
},
}

var headscaleCmd = &cobra.Command{
Use: "headscale",
Short: "headscale - a Tailscale control server",
Expand All @@ -47,7 +30,7 @@ func main() {
headscaleCmd.AddCommand(cli.PreauthkeysCmd)
headscaleCmd.AddCommand(cli.RoutesCmd)
headscaleCmd.AddCommand(cli.ServeCmd)
headscaleCmd.AddCommand(versionCmd)
headscaleCmd.AddCommand(cli.VersionCmd)

cli.NodeCmd.PersistentFlags().StringP("namespace", "n", "", "Namespace")
err = cli.NodeCmd.MarkPersistentFlagRequired("namespace")
Expand Down

0 comments on commit 48ec51d

Please sign in to comment.