From fa666be37fbe0f6fd97bd1ba0b411d6945dbc8dc Mon Sep 17 00:00:00 2001
From: Shawn Carey <shawn.carey@netfoundry.io>
Date: Thu, 2 Apr 2020 08:56:03 -0400
Subject: [PATCH] don't  configure root command with PersistentPostRun, because
 it doesn't apply for all subcommands. (#77)

do configure run subcommand with PostRun.
---
 ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go |  7 +++----
 ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go  | 15 ++++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go
index 64c571a93..e8e6d14c2 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go
@@ -45,10 +45,9 @@ func init() {
 }
 
 var root = &cobra.Command{
-	Use:               filepath.Base(os.Args[0]),
-	Short:             "Ziti Tunnel",
-	PersistentPreRun:  rootPreRun,
-	PersistentPostRun: rootPostRun,
+	Use:              filepath.Base(os.Args[0]),
+	Short:            "Ziti Tunnel",
+	PersistentPreRun: rootPreRun,
 }
 
 var interceptor intercept.Interceptor
diff --git a/ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go
index 77dbb50ec..b1b781944 100644
--- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go
+++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/run.go
@@ -19,19 +19,20 @@
 package subcmd
 
 import (
+	"github.com/michaelquigley/pfxlog"
 	"github.com/netfoundry/ziti-edge/tunnel/intercept"
 	"github.com/netfoundry/ziti-edge/tunnel/intercept/tproxy"
 	"github.com/netfoundry/ziti-edge/tunnel/intercept/tun"
-	"github.com/michaelquigley/pfxlog"
 	"github.com/spf13/cobra"
 )
 
 var runCmd = &cobra.Command{
-	Use:   "run <config>",
-	Short: "Auto-select interceptor",
-	Long:  "Provided for backwards compatibility with scripts that were coded around older ziti-tunnel versions.",
-	Args:  cobra.MaximumNArgs(1),
-	Run:   run,
+	Use:     "run <config>",
+	Short:   "Auto-select interceptor",
+	Long:    "Provided for backwards compatibility with scripts that were coded around older ziti-tunnel versions.",
+	Args:    cobra.MaximumNArgs(1),
+	Run:     run,
+	PostRun: rootPostRun,
 }
 
 func init() {
@@ -68,4 +69,4 @@ func run(cmd *cobra.Command, args []string) {
 	if interceptor == nil {
 		log.Fatal("failed to initialize an interceptor")
 	}
-}
\ No newline at end of file
+}