diff --git a/cmd/cmd.go b/cmd/cmd.go index ca481b6..aba47fc 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -1,29 +1,12 @@ package cmd import ( - "fmt" "github.com/spf13/cobra" "log" ) -var ( - version = "TempVersion" //use ldflags replace - codename = "V2bX" - intro = "A V2board backend based on Xray-core" -) - -func showVersion() { - fmt.Printf("%s %s (%s) \n", codename, version, intro) - // Warning - fmt.Println(Warn("This version need V2board version >= 1.7.0.")) - fmt.Println(Warn("This version changed config file. Please check config file before running.")) -} - var command = &cobra.Command{ Use: "V2bX", - PreRun: func(_ *cobra.Command, _ []string) { - showVersion() - }, } func Run() { diff --git a/cmd/install_linux.go b/cmd/install_linux.go index b4cfde4..47448f5 100644 --- a/cmd/install_linux.go +++ b/cmd/install_linux.go @@ -49,6 +49,7 @@ func uninstallHandle(_ *cobra.Command, _ []string) { _ = os.RemoveAll("/etc/systemd/system/V2bX.service") _ = os.RemoveAll("/etc/V2bX/") _ = os.RemoveAll("/usr/local/V2bX/") + _ = os.RemoveAll("/bin/V2bX") _, err = execCommand("systemctl daemon-reload&&systemctl reset-failed") if err != nil { fmt.Println(Err("exec cmd error: ", err)) diff --git a/cmd/server.go b/cmd/server.go index e657679..f014044 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -36,6 +36,7 @@ func init() { } func serverHandle(_ *cobra.Command, _ []string) { + showVersion() c := conf.New() err := c.LoadFromPath(config) if err != nil { diff --git a/cmd/version.go b/cmd/version.go new file mode 100644 index 0000000..92a5204 --- /dev/null +++ b/cmd/version.go @@ -0,0 +1,31 @@ +package cmd + +import ( + "fmt" + "github.com/spf13/cobra" +) + +var ( + version = "TempVersion" //use ldflags replace + codename = "V2bX" + intro = "A V2board backend based on Xray-core" +) + +var versionCommand = cobra.Command{ + Use: "version", + Short: "Print version info", + Run: func(cmd *cobra.Command, args []string) { + showVersion() + }, +} + +func init() { + command.AddCommand(&versionCommand) +} + +func showVersion() { + fmt.Printf("%s %s (%s) \n", codename, version, intro) + // Warning + fmt.Println(Warn("This version need V2board version >= 1.7.0.")) + fmt.Println(Warn("This version changed config file. Please check config file before running.")) +}