Skip to content

Feature/fix 190 exit error #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcottle merged 2 commits into from
Sep 29, 2015
Merged

Feature/fix 190 exit error #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7658520
Add exit statement to output file
Sep 26, 2015
cd536e2
Remove spurious debug
Sep 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/choose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand All @@ -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

Expand All @@ -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()):
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def execComposedCommand(command, lineObjs):
appendAliasExpansion()
appendIfInvalid(lineObjs)
appendFriendlyCommand(command)
appendExit()


def editFiles(lineObjs):
Expand All @@ -54,6 +55,7 @@ def editFiles(lineObjs):
command = joinEditCommands(partialCommands)
appendIfInvalid(lineObjs)
appendToFile(command)
appendExit()


# Private helpers
Expand Down Expand Up @@ -193,6 +195,9 @@ def appendToFile(command):
file.close()
logger.output()

def appendExit():
appendToFile('exit $?;')


def writeToFile(command):
file = open(stateFiles.getScriptOutputFilePath(), 'w')
Expand Down