diff --git a/README.md b/README.md index 26b499e..2e31378 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,12 @@ INSTALLATION ### REQUIREMENTS - Python v2.6+ -- Bash v4.0+, zsh, fish, or clink (Windows) +- Supported shells: + - bash v4.0+ + - zsh + - fish + - tcsh (experimental) + - clink on Windows (experimental) ### AUTOMATIC diff --git a/docs/install.md b/docs/install.md index 715dfa8..3ad6a98 100644 --- a/docs/install.md +++ b/docs/install.md @@ -3,7 +3,12 @@ ### REQUIREMENTS - Python v2.6+ -- Bash v4.0+, zsh, fish, or clink (Windows) +- Supported shells: + - bash v4.0+ + - zsh + - fish + - tcsh (experimental) + - clink (Windows, experimental) ### AUTOMATIC diff --git a/install.py b/install.py index 9fc3713..a8d68c9 100755 --- a/install.py +++ b/install.py @@ -10,7 +10,7 @@ import sys sys.path.append('bin') from autojump_argparse import ArgumentParser -SUPPORTED_SHELLS = ('bash', 'zsh', 'fish') +SUPPORTED_SHELLS = ('bash', 'zsh', 'fish', 'tcsh') def cp(src, dest, dryrun=False): @@ -157,6 +157,7 @@ def print_post_installation_message(etc_dir, bin_dir): print('\n\t' + source_msg) if get_shell() == 'zsh': print("\n\tautoload -U compinit && compinit -u") + print("\nPlease restart terminal(s) before running autojump.\n") diff --git a/tests/autojump_utils_test.py b/tests/autojump_utils_test.py index fe040bb..d6ed105 100644 --- a/tests/autojump_utils_test.py +++ b/tests/autojump_utils_test.py @@ -6,7 +6,6 @@ import sys import mock import pytest -# Python 3 compatibility if sys.version_info[0] == 3: os.getcwdu = os.getcwd sys.path.append(os.path.join(os.getcwd(), 'bin')) diff --git a/uninstall.py b/uninstall.py index 3e41fc6..ab76317 100755 --- a/uninstall.py +++ b/uninstall.py @@ -78,6 +78,7 @@ def remove_custom_installation(args, dryrun=False): rm(os.path.join(etc_dir, 'autojump.sh'), dryrun) rm(os.path.join(etc_dir, 'autojump.bash'), dryrun) rm(os.path.join(etc_dir, 'autojump.fish'), dryrun) + rm(os.path.join(etc_dir, 'autojump.tcsh'), dryrun) rm(os.path.join(etc_dir, 'autojump.zsh'), dryrun) rm(os.path.join(zshshare_dir, '_j'), dryrun) rmdir(icon_dir, dryrun) @@ -114,6 +115,7 @@ def remove_system_installation(dryrun=False): rm(os.path.join(etc_dir, 'autojump.sh'), dryrun) rm(os.path.join(etc_dir, 'autojump.bash'), dryrun) rm(os.path.join(etc_dir, 'autojump.fish'), dryrun) + rm(os.path.join(etc_dir, 'autojump.tcsh'), dryrun) rm(os.path.join(etc_dir, 'autojump.zsh'), dryrun) rm(os.path.join(zshshare_dir, '_j'), dryrun) rmdir(icon_dir, dryrun)