Showing the server MOTD when calling scw run <image> [COMMAND] without *COMMAND*

Author: moul

README.md

@@ -1019,6 +1019,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 #### Features
 
+* Showing the server MOTD when calling `scw run <image> [COMMAND]` without *COMMAND*
 * Support of `scw attach --no-stdin` option
 * Hiding sensitive data by default on `scw inspect` ([#64](https://github.com/scaleway/scaleway-cli/issues/64))
 * Support of `scw --sensitive` option ([#64](https://github.com/scaleway/scaleway-cli/issues/64))

commands/run.go

@@ -94,7 +94,7 @@ func runRun(cmd *types.Command, args []string) {
 		// exec -w SERVER COMMAND ARGS...
 		log.Debugf("Executing command")
 		if len(args) < 2 {
-			err = utils.SSHExec(server.PublicAddress.IP, []string{"if [ -x /bin/bash ]; then exec /bin/bash; else exec /bin/sh; fi"}, false)
+			err = utils.SSHExec(server.PublicAddress.IP, []string{}, false)
 		} else {
 			err = utils.SSHExec(server.PublicAddress.IP, args[1:], false)
 		}

utils/utils.go

@@ -60,15 +60,17 @@ func NewSSHExecCmd(ipAddress string, allocateTTY bool, command []string) []strin
 		execCmd = append(execCmd, "-t")
 	}
 
-	execCmd = append(execCmd, "--", "/bin/sh", "-e")
+	if len(command) > 0 {
+		execCmd = append(execCmd, "--", "/bin/sh", "-e")
 
-	if os.Getenv("DEBUG") == "1" {
-		execCmd = append(execCmd, "-x")
-	}
+		if os.Getenv("DEBUG") == "1" {
+			execCmd = append(execCmd, "-x")
+		}
 
-	execCmd = append(execCmd, "-c")
+		execCmd = append(execCmd, "-c")
 
-	execCmd = append(execCmd, fmt.Sprintf("%q", strings.Join(command, " ")))
+		execCmd = append(execCmd, fmt.Sprintf("%q", strings.Join(command, " ")))
+	}
 
 	return execCmd
 }