add: compatible with postinit

tinynetwork · Dec 13, 2019 · b818040 · b818040
1 parent b7d232a
commit b818040
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/cmd/reconf.go b/cmd/reconf.go
@@ -38,12 +38,6 @@ var reconfCmd = &cobra.Command{
 				fmt.Println(strings.Join(preExecInitCmds, "\n"))
 			}
 		}
-		if len(tnconfig.PostInit) != 0 {
-			for _, postInitCmds := range tnconfig.PostInit {
-				postExecInitCmds := shell.ExecCmd(postInitCmds.Cmds)
-				fmt.Println(strings.Join(postExecInitCmds, "\n"))
-			}
-		}
 		for _, node := range tnconfig.Nodes {
 			createNodeCmds := shell.CreateNode(node)
 			fmt.Println(strings.Join(createNodeCmds, "\n"))
@@ -82,6 +76,13 @@ var reconfCmd = &cobra.Command{
 			}
 		}
 
+		if len(tnconfig.PostInit) != 0 {
+			for _, postInitCmds := range tnconfig.PostInit {
+				postExecInitCmds := shell.ExecCmd(postInitCmds.Cmds)
+				fmt.Println(strings.Join(postExecInitCmds, "\n"))
+			}
+		}
+
 		nodeinfo := map[string]string{}
 		for _, node := range tnconfig.Nodes {
 			nodeinfo[node.Name] = node.Type

diff --git a/cmd/reup.go b/cmd/reup.go
@@ -38,12 +38,6 @@ var reupCmd = &cobra.Command{
 				fmt.Println(strings.Join(preExecInitCmds, "\n"))
 			}
 		}
-		if len(tnconfig.PostInit) != 0 {
-			for _, postInitCmds := range tnconfig.PostInit {
-				postExecInitCmds := shell.ExecCmd(postInitCmds.Cmds)
-				fmt.Println(strings.Join(postExecInitCmds, "\n"))
-			}
-		}
 		for _, node := range tnconfig.Nodes {
 			createNodeCmds := shell.CreateNode(node)
 			fmt.Println(strings.Join(createNodeCmds, "\n"))
@@ -81,6 +75,13 @@ var reupCmd = &cobra.Command{
 				}
 			}
 		}
+
+		if len(tnconfig.PostInit) != 0 {
+			for _, postInitCmds := range tnconfig.PostInit {
+				postExecInitCmds := shell.ExecCmd(postInitCmds.Cmds)
+				fmt.Println(strings.Join(postExecInitCmds, "\n"))
+			}
+		}
 	},
 }
 

diff --git a/cmd/up.go b/cmd/up.go
@@ -27,12 +27,6 @@ var upCmd = &cobra.Command{
 				fmt.Println(strings.Join(preExecInitCmds, "\n"))
 			}
 		}
-		if len(tnconfig.PostInit) != 0 {
-			for _, postInitCmds := range tnconfig.PostInit {
-				postExecInitCmds := shell.ExecCmd(postInitCmds.Cmds)
-				fmt.Println(strings.Join(postExecInitCmds, "\n"))
-			}
-		}
 		for _, node := range tnconfig.Nodes {
 			createNodeCmds := shell.CreateNode(node)
 			fmt.Println(strings.Join(createNodeCmds, "\n"))
@@ -70,6 +64,13 @@ var upCmd = &cobra.Command{
 				}
 			}
 		}
+
+		if len(tnconfig.PostInit) != 0 {
+			for _, postInitCmds := range tnconfig.PostInit {
+				postExecInitCmds := shell.ExecCmd(postInitCmds.Cmds)
+				fmt.Println(strings.Join(postExecInitCmds, "\n"))
+			}
+		}
 	},
 }