Tidy output

Author: nicholasjackson

cmd/env.go

@@ -17,14 +17,17 @@ func newEnvCmd(e shipyard.Engine) *cobra.Command {
 		Long:  "Prints environment variables defined by the blueprint",
 		Example: `
   # Display environment variables
-	shipyard env
-
-	VAR1=value
-	VAR2=value
-
-	# Set environemnt variables
-	eval $(shipyard env)
-	`,
+  shipyard env
+  
+  VAR1=value
+  VAR2=value
+  
+  # Set environment variables on Linux based systems
+  eval $(shipyard env)
+    
+  # Set environment variables on Windows based systems
+  @FOR /f "tokens=*" %i IN ('shipyard env') DO @%
+`,
 		Args: cobra.ArbitraryArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 

cmd/run.go

@@ -209,16 +209,24 @@ func newRunCmdFunc(e shipyard.Engine, bp clients.Getter, hc clients.HTTP, bc cli
 			cmd.Println("")
 
 			if len(e.Blueprint().Environment) > 0 {
-				cmd.Println("This blueprint defines the following environment varaibles:")
+				cmd.Println("######################################################")
+				cmd.Println("")
+				cmd.Println("Environment Variables")
+				cmd.Println("")
+				cmd.Println("######################################################")
+
+				cmd.Println("")
+				cmd.Println("This blueprint exports the following environment varaibles:")
 				cmd.Println("")
 				for _, env := range e.Blueprint().Environment {
-					cmd.Printf("%s=%s\n", env.Key, env.Value)
+					cmd.Printf("\033[1;32m%s=%s=\033[0m\n", env.Key, env.Value)
 				}
 				cmd.Println("")
-				cmd.Println("You can set these using the following command:")
+				cmd.Println("You can set exported environment variables for your current terminal session using the following command:")
+				cmd.Println("")
 
 				if runtime.GOOS == "windows" {
-					cmd.Println(`@FOR /f "tokens=*" %i IN ('minikube -p minikube docker-env') DO @%i`)
+					cmd.Println(`@FOR /f "tokens=*" %i IN ('shipyard env') DO @%i`)
 				} else {
 					cmd.Println("eval $(shipyard env)")
 				}