Merge pull request #191 from slackorama/feature/fix-190-exit-error

Feature/fix 190 exit error

Author: pcottle

src/choose.py

@@ -49,6 +49,7 @@ def getLineObjs():
         lineObjs = pickle.load(open(filePath, 'rb'))
     except:
         output.appendError(LOAD_SELECTION_WARNING)
+        output.appendExit()
         sys.exit(1)
     logger.addEvent('total_num_files', len(lineObjs))
 
@@ -59,7 +60,8 @@ def getLineObjs():
     matches = [lineObj for lineObj in lineObjs.values()
                if not lineObj.isSimple()]
     if not len(matches):
-        output.writeToFile('echo "No lines matched!!"')
+        output.writeToFile('echo "No lines matched!!";')
+        output.appendExit()
         sys.exit(0)
     return lineObjs
 
@@ -69,6 +71,7 @@ def setSelectionsFromPickle(selectionPath, lineObjs):
         selectedIndices = pickle.load(open(selectionPath, 'rb'))
     except:
         output.appendError(LOAD_SELECTION_WARNING)
+        output.appendExit()
         sys.exit(1)
     for index in selectedIndices:
         if index >= len(lineObjs.items()):
@@ -87,7 +90,8 @@ def setSelectionsFromPickle(selectionPath, lineObjs):
     filePath = stateFiles.getPickleFilePath()
     if not os.path.exists(filePath):
         print('Nothing to do!')
-        output.writeToFile('echo ":D"')
+        output.writeToFile('echo ":D";')
+        output.appendExit()
         sys.exit(0)
     output.clearFile()
     # we initialize our args *before* we move into curses

src/output.py

@@ -43,6 +43,7 @@ def execComposedCommand(command, lineObjs):
     appendAliasExpansion()
     appendIfInvalid(lineObjs)
     appendFriendlyCommand(command)
+    appendExit()
 
 
 def editFiles(lineObjs):
@@ -54,6 +55,7 @@ def editFiles(lineObjs):
     command = joinEditCommands(partialCommands)
     appendIfInvalid(lineObjs)
     appendToFile(command)
+    appendExit()
 
 
 # Private helpers
@@ -193,6 +195,9 @@ def appendToFile(command):
     file.close()
     logger.output()
 
+def appendExit():
+    appendToFile('exit $?;')
+
 
 def writeToFile(command):
     file = open(stateFiles.getScriptOutputFilePath(), 'w')