Skip to content

Commit

Permalink
re-enable --locate-extra-shell-verbs, see catkin#244
Browse files Browse the repository at this point in the history
  • Loading branch information
k-okada committed Apr 20, 2016
1 parent 359d8be commit 7995418
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions catkin_tools/commands/catkin.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ def catkin_main(sysargs):
help='Forces catkin to output in color, even when the terminal does not appear to support it.')
add('--no-color', action='store_true', default=False,
help='Forces catkin to not use color in the output, regardless of the detect terminal type.')
add('--locate-extra-shell-verbs', action='store_true',
help='Returns the full path of extra shell verbs settings files')


# Generate a list of verbs available
verbs = list_verbs()
Expand Down Expand Up @@ -209,6 +212,13 @@ def catkin_main(sysargs):
if not arg.startswith('-'):
break

# Check for --locate-extra-shell-verbs
for arg in sysargs:
if arg == '--locate-extra-shell-verbs':
from pkg_resources import resource_filename
print(os.path.abspath(resource_filename(__name__, '../verbs/catkin_shell_verbs.bash')))
sys.exit(0)

# Do verb alias expansion
sysargs = expand_verb_aliases(sysargs, verb_aliases)

Expand Down

0 comments on commit 7995418

Please sign in to comment.