diff --git a/setup.py b/setup.py index 2d938ec..cab15aa 100755 --- a/setup.py +++ b/setup.py @@ -51,5 +51,4 @@ setup(name='thefuck', extras_require=extras_require, entry_points={'console_scripts': [ 'thefuck = thefuck.main:main', - 'thefuck-alias = thefuck.main:print_alias', 'fuck = thefuck.main:how_to_configure_alias']}) diff --git a/thefuck/main.py b/thefuck/main.py index 7a9c371..6ca89ac 100644 --- a/thefuck/main.py +++ b/thefuck/main.py @@ -4,7 +4,6 @@ from .system import init_output init_output() from argparse import ArgumentParser -from warnings import warn from pprint import pformat import sys from . import logs, types @@ -37,17 +36,13 @@ def fix_command(): sys.exit(1) -def print_alias(entry_point=True): +def print_alias(): """Prints alias for current shell.""" - if entry_point: - warn('`thefuck-alias` is deprecated, use `thefuck --alias` instead.') - position = 1 - else: - position = 2 + try: + alias = sys.argv[2] + except IndexError: + alias = get_alias() - alias = get_alias() - if len(sys.argv) > position: - alias = sys.argv[position] print(shell.app_alias(alias)) @@ -76,8 +71,9 @@ def main(): nargs='*', help='command that should be fixed') known_args = parser.parse_args(sys.argv[1:2]) + if known_args.alias: - print_alias(False) + print_alias() elif known_args.command: fix_command() else: