From cd0959bba0e4d2e4c6ff07956f92b1fe0d54b6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=98=89=E8=81=AA?= <9a6c5609806a@gmail.com>
Date: Sat, 11 May 2019 16:54:36 +0800
Subject: [PATCH] fix frps service init

---
 cmd/frps/root.go    | 12 +++++++++++-
 cmd/frps/service.go |  6 ------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cmd/frps/root.go b/cmd/frps/root.go
index be51ccde..a8959477 100644
--- a/cmd/frps/root.go
+++ b/cmd/frps/root.go
@@ -97,7 +97,17 @@ var rootCmd = &cobra.Command{
 		}
 
 		if !service.Interactive() {
-			if err := srvCmd.Execute(); err != nil {
+			var err error
+			srv, err = service.New(&serviceFRP{}, &service.Config{
+				Name:        srvName,
+				DisplayName: srvDName,
+				Description: srvDesc,
+			})
+			if err != nil {
+				fmt.Println(err)
+				os.Exit(1)
+			}
+			if err = srv.Run(); err != nil {
 				fmt.Println(err)
 				os.Exit(1)
 			}
diff --git a/cmd/frps/service.go b/cmd/frps/service.go
index ad22c9ba..dfb832e7 100644
--- a/cmd/frps/service.go
+++ b/cmd/frps/service.go
@@ -38,12 +38,6 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&srvDName, "display_name", "frps", "Service display name")
 	rootCmd.PersistentFlags().StringVar(&srvDesc, "description", "frps service", "Service description")
 
-	if !service.Interactive() {
-		srvCmd.RunE = func(cmd *cobra.Command, args []string) error {
-			return srv.Run()
-		}
-	}
-
 	srvCmd.AddCommand(installSrvCmd, uninstallSrvCmd, startSrvCmd, stopSrvCmd, restartSrvCmd)
 	rootCmd.AddCommand(srvCmd)
 }