From 0b9f9b43a8ff30eb88a0fc651cb304210031883d Mon Sep 17 00:00:00 2001
From: Manfred Touron <m@42.am>
Date: Mon, 13 Nov 2017 20:08:12 +0100
Subject: [PATCH] Implement exit (fix #6)

---
 README.md |  1 +
 shell.go  | 31 +++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 07ab057..26bc981 100644
--- a/README.md
+++ b/README.md
@@ -181,6 +181,7 @@ usergroup ls [-h]
 usergroup rm [-h] <id or name> [<id or name> [<id or name>...]]
 
 # other
+exit [-h]
 help, h
 info [-h]
 version [-h]
diff --git a/shell.go b/shell.go
index 60f6e35..178b91f 100644
--- a/shell.go
+++ b/shell.go
@@ -44,8 +44,7 @@ GLOBAL OPTIONS:
    {{end}}{{end}}
 `
 	cli.OsExiter = func(c int) {
-		// FIXME: forward valid exit code
-		io.WriteString(s, fmt.Sprintf("exit: %d\n", c))
+		return
 	}
 	cli.HelpFlag = cli.BoolFlag{
 		Name:   "help, h",
@@ -893,6 +892,12 @@ GLOBAL OPTIONS:
 				fmt.Fprintf(s, "%s\n", version)
 				return nil
 			},
+		}, {
+			Name:  "exit",
+			Usage: "Exit",
+			Action: func(c *cli.Context) error {
+				return cli.NewExitError("", 0)
+			},
 		},
 	}
 
@@ -909,13 +914,31 @@ GLOBAL OPTIONS:
 				io.WriteString(s, "syntax error.\n")
 				continue
 			}
+			if len(words) == 1 && strings.ToLower(words[0]) == "exit" {
+				s.Exit(0)
+				return nil
+			}
 			if err := app.Run(append([]string{"config"}, words...)); err != nil {
-				io.WriteString(s, fmt.Sprintf("error: %v\n", err))
+				if cliErr, ok := err.(*cli.ExitError); ok {
+					if cliErr.ExitCode() != 0 {
+						io.WriteString(s, fmt.Sprintf("error: %v\n", err))
+					}
+					//s.Exit(cliErr.ExitCode())
+				} else {
+					io.WriteString(s, fmt.Sprintf("error: %v\n", err))
+				}
 			}
 		}
 	} else { // oneshot mode
 		if err := app.Run(append([]string{"config"}, sshCommand...)); err != nil {
-			io.WriteString(s, fmt.Sprintf("error: %v\n", err))
+			if errMsg := err.Error(); errMsg != "" {
+				io.WriteString(s, fmt.Sprintf("error: %s\n", errMsg))
+			}
+			if cliErr, ok := err.(*cli.ExitError); ok {
+				s.Exit(cliErr.ExitCode())
+			} else {
+				s.Exit(1)
+			}
 		}
 	}