From b159cd327ca38d43183aa379f31bf8bca8017808 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Tue, 15 Aug 2017 00:43:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=87=D0=B8=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20?= =?UTF-8?q?=D0=B2=20cmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/root.go | 39 +++------------------------------------ cmd/serve.go | 4 +--- 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 9171a1d..c13b8bf 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -4,26 +4,15 @@ import ( "fmt" "os" - "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/viper" ) var cfgFile string -// RootCmd represents the base command when called without any subcommands var RootCmd = &cobra.Command{ - Use: "test", - Short: "A brief description of your application", - Long: `A longer description that spans multiple lines and likely contains -examples and usage of using your application. For example: - -Cobra is a CLI library for Go that empowers applications. -This application is a tool to generate the needed files -to quickly create a Cobra application.`, - // Uncomment the following line if your bare application - // has an action associated with it: - // Run: func(cmd *cobra.Command, args []string) { }, + Use: "", + Short: "Nothing here", } // Execute adds all child commands to the root command and sets flags appropriately. @@ -37,38 +26,16 @@ func Execute() { func init() { cobra.OnInitialize(initConfig) - - // Here you will define your flags and configuration settings. - // Cobra supports persistent flags, which, if defined here, - // will be global for your application. RootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.test.yaml)") - - // Cobra also supports local flags, which will only run - // when this action is called directly. - RootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") } -// initConfig reads in config file and ENV variables if set. func initConfig() { if cfgFile != "" { - // Use config file from the flag. viper.SetConfigFile(cfgFile) - } else { - // Find home directory. - home, err := homedir.Dir() - if err != nil { - fmt.Println(err) - os.Exit(1) - } - - // Search config in home directory with name ".test" (without extension). - viper.AddConfigPath(home) - viper.SetConfigName(".test") } - viper.AutomaticEnv() // read in environment variables that match + viper.AutomaticEnv() - // If a config file is found, read it in. if err := viper.ReadInConfig(); err == nil { fmt.Println("Using config file:", viper.ConfigFileUsed()) } diff --git a/cmd/serve.go b/cmd/serve.go index adeae9e..faa8b9d 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -14,11 +14,9 @@ import ( "elyby/minecraft-skinsystem/ui" ) -// serveCmd represents the serve command var serveCmd = &cobra.Command{ Use: "serve", - Short: "Запускает сервер системы скинов", - Long: "Более длинное описание пока не было придумано", + Short: "Runs the system server skins", Run: func(cmd *cobra.Command, args []string) { wd.AddReceiver(ansi.New(true, true, false)) logger := wd.New("", "").WithParams(rays.Host)