fix: all "next steps" messages should be last (#1025)

dymensionxyz · Sep 22, 2024 · e617da5 · e617da5
1 parent 94dd1d0
commit e617da5
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 79 deletions.
diff --git a/cmd/eibc/init/init.go b/cmd/eibc/init/init.go
@@ -134,12 +134,15 @@ func Cmd() *cobra.Command {
 				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
 					Sprintf(eibcHome),
 			)
-			pterm.Info.Println("next steps:")
-			pterm.Info.Printf(
-				"run %s to start the eibc client in interactive mode\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller eibc start"),
-			)
+
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Printf(
+					"run %s to start the eibc client in interactive mode\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller eibc start"),
+				)
+			}()
 		},
 	}
 	return cmd

diff --git a/cmd/relayer/setup/setup.go b/cmd/relayer/setup/setup.go
@@ -418,12 +418,14 @@ func Cmd() *cobra.Command {
 				}
 			}
 
-			pterm.Info.Println("next steps:")
-			pterm.Info.Printf(
-				"run %s load the necessary systemd services\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller relayer services load"),
-			)
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Printf(
+					"run %s load the necessary systemd services\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller relayer services load"),
+				)
+			}()
 		},
 	}
 

diff --git a/cmd/rollapp/config/set/set.go b/cmd/rollapp/config/set/set.go
@@ -102,13 +102,15 @@ func Cmd() *cobra.Command {
 				return
 			}
 
-			pterm.Info.Println("next steps:")
-			pterm.Info.Println("if this was the only configuration value you wanted to update")
-			pterm.Info.Printf(
-				"run %s to restart the systemd services and apply the new values\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller rollapp services restart"),
-			)
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Println("if this was the only configuration value you wanted to update")
+				pterm.Info.Printf(
+					"run %s to restart the systemd services and apply the new values\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller rollapp services restart"),
+				)
+			}()
 		},
 	}
 

diff --git a/cmd/rollapp/init/init.go b/cmd/rollapp/init/init.go
@@ -184,13 +184,15 @@ func Cmd() *cobra.Command {
 				return
 			}
 
-			pterm.Info.Println("next steps:")
-			pterm.Info.Printf(
-				"run %s prepare node configuration for %s RollApp\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller rollapp setup"),
-				raID,
-			)
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Printf(
+					"run %s prepare node configuration for %s RollApp\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller rollapp setup"),
+					raID,
+				)
+			}()
 		},
 	}
 

diff --git a/cmd/rollapp/sequencer/metadata/export/export.go b/cmd/rollapp/sequencer/metadata/export/export.go
@@ -113,13 +113,16 @@ func Cmd() *cobra.Command {
 			}
 
 			pterm.Info.Printf("metadata successfully exported to %s\n", metadataFilePath)
-			pterm.Info.Println("next steps:")
-			pterm.Info.Println("update the metadata file")
-			pterm.Info.Printf(
-				"run %s to submit a transaction to update the sequencer metadata\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller rollapp sequencer metadata update"),
-			)
+
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Println("update the metadata file")
+				pterm.Info.Printf(
+					"run %s to submit a transaction to update the sequencer metadata\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller rollapp sequencer metadata update"),
+				)
+			}()
 		},
 	}
 

diff --git a/cmd/rollapp/setup/setup.go b/cmd/rollapp/setup/setup.go
@@ -733,12 +733,14 @@ func Cmd() *cobra.Command {
 
 			pterm.Info.Println("initialization complete")
 
-			pterm.Info.Println("next steps:")
-			pterm.Info.Printf(
-				"run %s load the necessary systemd services\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller rollapp services load"),
-			)
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Printf(
+					"run %s load the necessary systemd services\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller rollapp services load"),
+				)
+			}()
 		},
 	}
 

diff --git a/cmd/services/load/load.go b/cmd/services/load/load.go
@@ -135,13 +135,15 @@ func Cmd(services []string, module string) *cobra.Command {
 				}
 			}
 
-			pterm.Info.Println("next steps:")
-			pterm.Info.Printf(
-				"run %s to start %s on your local machine\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller %s services start", module),
-				strings.Join(services, ", "),
-			)
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Printf(
+					"run %s to start %s on your local machine\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller %s services start", module),
+					strings.Join(services, ", "),
+				)
+			}()
 		},
 	}
 	return cmd

diff --git a/cmd/services/start/start.go b/cmd/services/start/start.go
@@ -37,17 +37,19 @@ func RollappCmd() *cobra.Command {
 				return
 			}
 
-			pterm.Info.Println("next steps:")
-			pterm.Info.Printf(
-				"run %s to set up IBC channels and start relaying packets\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller relayer setup"),
-			)
-			pterm.Info.Printf(
-				"run %s to view the logs  of the rollapp\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller rollapp services logs"),
-			)
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Printf(
+					"run %s to set up IBC channels and start relaying packets\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller relayer setup"),
+				)
+				pterm.Info.Printf(
+					"run %s to view the logs  of the rollapp\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller rollapp services logs"),
+				)
+			}()
 		},
 	}
 	return cmd
@@ -77,17 +79,19 @@ func RelayerCmd() *cobra.Command {
 				)
 			}
 
-			pterm.Info.Println("next steps:")
-			pterm.Info.Printf(
-				"run %s to join the eibc market\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller eibc init"),
-			)
-			pterm.Info.Printf(
-				"run %s to view the current status of the relayer\n",
-				pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-					Sprintf("roller relayer services logs"),
-			)
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Printf(
+					"run %s to join the eibc market\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller eibc init"),
+				)
+				pterm.Info.Printf(
+					"run %s to view the current status of the relayer\n",
+					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+						Sprintf("roller relayer services logs"),
+				)
+			}()
 		},
 	}
 	return cmd
@@ -117,18 +121,21 @@ func EibcCmd() *cobra.Command {
 				)
 			}
 
-			pterm.Info.Println("next steps:")
-			pterm.Info.Println(
-				"that's all folks",
-			)
-
-			if runtime.GOOS == "linux" {
-				pterm.Info.Printf(
-					"run %s to view the current status of the eibc client\n",
-					pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
-						Sprintf("journalctl -fu eibc"),
+			defer func() {
+				pterm.Info.Println("next steps:")
+				pterm.Info.Println(
+					"that's all folks",
 				)
-			}
+
+				if runtime.GOOS == "linux" {
+					pterm.Info.Printf(
+						"run %s to view the current status of the eibc client\n",
+						pterm.DefaultBasicText.WithStyle(pterm.FgYellow.ToStyle()).
+							Sprintf("journalctl -fu eibc"),
+					)
+				}
+			}()
+
 		},
 	}
 	return cmd