Git
/
cheat
mirror of https://github.com/cheat/cheat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added 1 check for EDITOR var, if EDITOR is set to "" + added try catch to catch subprocess error like EDITOR variable pointing to a non installed editor

This commit is contained in:
0rax 2013-09-20 02:27:06 +02:00
parent 72b7af171d
commit 50b04c52e1
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
cheat
View File

@ -69,7 +69,7 @@ class CheatSheets(object):
if not self.dirs: if not self.dirs:
error_msg = 'The {default} dir does not exist or the CHEATPATH var is not set.' error_msg = 'The {default} dir does not exist or the CHEATPATH var is not set.'
print >> sys.stderr, error_msg.format(default=DEFAULT_CHEAT_DIR) print >> sys.stderr, error_msg.format(default=DEFAULT_CHEAT_DIR)
exit() exit(1)
self.sheets = self.__cheat_files() self.sheets = self.__cheat_files()
def __cheat_directories(self): def __cheat_directories(self):
@ -106,27 +106,38 @@ class CheatSheets(object):
# Assert that the EDITOR environment variable is set and that at least 3 # Assert that the EDITOR environment variable is set and that at least 3
# arguments have been given # arguments have been given
if 'EDITOR' not in os.environ: if 'EDITOR' not in os.environ:
print('In order to use "create" or "edit" you must set your ' print >> sys.stderr, ('In order to create/edit a cheatsheet you '
'EDITOR environment variable to your favorite editor\'s path') 'must set your EDITOR environment variable to your favorite '
exit() 'editor\'s path.')
exit(1)
elif os.environ['EDITOR'] == "":
print >> sys.stderr, ('Your EDITOR environment variable is set '
'to nothing, in order to create/edit a cheatsheet your must '
'set it to a valid editor\'s path.')
exit(1)
else: else:
editor = os.environ['EDITOR'].split() editor = os.environ['EDITOR'].split()
# if the cheatsheet already exists, open it for editing # if the cheatsheet already exists, open it for editing
if cheat in sheets.sheets: try:
subprocess.call(editor + [os.path.join(self.sheets[cheat], cheat)]) if cheat in sheets.sheets:
subprocess.call(editor + [os.path.join(self.sheets[cheat], cheat)])
# otherwise, create it # otherwise, create it
else:
import cheatsheets as cs
# Attempt to write the new cheatsheet to the user's ~/.cheat dir if it
# exists. If it does not exist, attempt to create it.
if os.access(DEFAULT_CHEAT_DIR, os.W_OK) or os.makedirs(DEFAULT_CHEAT_DIR):
subprocess.call(editor + [os.path.join(DEFAULT_CHEAT_DIR, cheat)])
# If the directory cannot be created, write to the python package
# directory, though that will likely require the use of sudo
else: else:
subprocess.call(editor + [os.path.join(cs.cheat_dir, cheat)]) import cheatsheets as cs
# Attempt to write the new cheatsheet to the user's ~/.cheat dir if it
# exists. If it does not exist, attempt to create it.
if os.access(DEFAULT_CHEAT_DIR, os.W_OK) or os.makedirs(DEFAULT_CHEAT_DIR):
subprocess.call(editor + [os.path.join(DEFAULT_CHEAT_DIR, cheat)])
# If the directory cannot be created, write to the python package
# directory, though that will likely require the use of sudo
else:
subprocess.call(editor + [os.path.join(cs.cheat_dir, cheat)])
except OSError, e:
print >> sys.stderr, ("Could not launch `%s` as your editor : %s"
% (editor[0], e.strerror))
exit(1)
def list(self): def list(self):
"""Lists the cheatsheets that are currently available""" """Lists the cheatsheets that are currently available"""