Merge branch 'master' into quoted_args

1 files changed, 6 insertions, 0 deletions

diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index be672465..6d76ac2b 100644
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -523,6 +523,9 @@ class Cmd(cmd.Cmd):
         # This boolean flag determines whether or not the cmd2 application can interact with the clipboard
         self.can_clip = can_clip
 
+        # This determines if a non-zero exit code should be used when exiting the application
+        self.exit_code = None
+
     # -----  Methods related to presenting output to the user -----
 
     @property
@@ -3235,6 +3238,9 @@ Script should contain one command per line, just like command would be typed in
             func()
         self.postloop()
 
+        if self.exit_code is not None:
+            sys.exit(self.exit_code)
+
     ###
     #
     # plugin related functions