mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-04 21:17:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

chore: solve license conflict against tun2socks

Browse source
This commit is contained in:
Haruue Icymoon 2022-08-10 12:24:06 +08:00
parent 80b0c87654
commit 720b97da67
No known key found for this signature in database
GPG key ID: F6083B28CBCBC148
7 changed files with 131 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/main.go
View file

@ -65,6 +65,12 @@ var rootCmd = &cobra.Command{
})
}
// license
if viper.GetBool("license") {
fmt.Printf("%s\n", license)
os.Exit(0)
}
// check update
if !viper.GetBool("no-check") {
go checkUpdate()
@ -154,6 +160,7 @@ func init() {
rootCmd.PersistentFlags().String("log-timestamp", time.RFC3339, "log timestamp format")
rootCmd.PersistentFlags().String("log-format", "txt", "log output format(txt/json)")
rootCmd.PersistentFlags().Bool("no-check", false, "disable update check")
rootCmd.PersistentFlags().Bool("license", false, "show license and exit")
// add to root cmd
rootCmd.AddCommand(clientCmd, serverCmd, completionCmd)
@ -165,6 +172,7 @@ func init() {
_ = viper.BindPFlag("log-timestamp", rootCmd.PersistentFlags().Lookup("log-timestamp"))
_ = viper.BindPFlag("log-format", rootCmd.PersistentFlags().Lookup("log-format"))
_ = viper.BindPFlag("no-check", rootCmd.PersistentFlags().Lookup("no-check"))
_ = viper.BindPFlag("license", rootCmd.PersistentFlags().Lookup("license"))
// bind env
_ = viper.BindEnv("config", "HYSTERIA_CONFIG")