Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2025-06-13 12:54:07 +00:00
Code Issues Releases Wiki Activity

Detect user shell as opposed to login shell.

Browse Source 
Fixes #256.
This commit is contained in:
William Ting 2014-10-04 20:27:51 -07:00
parent 0d80d91805
commit f480bd1315
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/autojump
View File

@ -59,7 +59,7 @@ from autojump_utils import sanitize
from autojump_utils import take
from autojump_utils import unico
VERSION = '22.0.1-beta'
VERSION = '22.0.2-beta'
FUZZY_MATCH_THRESHOLD = 0.6
TAB_ENTRIES_COUNT = 9
TAB_SEPARATOR = '__'

16
bin/autojump.sh
View File

@ -1,6 +1,16 @@
# source autojump on BASH or ZSH depending on the shell
shell=$(echo ${SHELL} | awk -F/ '{ print $NF }')
# the login $SHELL isn't always the one used
# NOTE: problems might occur if /bin/sh is symlinked to /bin/bash
if [ -n "${BASH}" ]; then
shell="bash"
elif [ -n "${ZSH_NAME}" ]; then
shell="zsh"
elif [ -n "${__fish_datadir}" ]; then
shell="fish"
elif [ -n "${version}" ]; then
shell="tcsh"
else
shell=$(echo ${SHELL} | awk -F/ '{ print $NF }')
fi
# prevent circular loop for sh shells
if [ "${shell}" = "sh" ]; then