Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00
Code Issues Releases Wiki Activity

merge fish_support branch

Browse Source
This commit is contained in:
William Ting 2013-06-04 08:01:18 -05:00
commit fca26f3ef4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/autojump
View File

@ -199,7 +199,7 @@ class Database:
def set_defaults(): def set_defaults():
config = {} config = {}
config['version'] = 'release-v21.6.9' config['version'] = 'release-v21.7.0'
config['max_paths'] = 1000 config['max_paths'] = 1000
config['separator'] = '__' config['separator'] = '__'
config['home'] = os.path.expanduser('~') config['home'] = os.path.expanduser('~')

8
install.sh
View File

@ -147,7 +147,8 @@ if [[ -n ${prefix} ]]; then
fi fi
# check shell support # check shell support
if [[ ${shell} != "bash" ]] && [[ ${shell} != "zsh" ]]; then if [[ ${shell} != "bash" ]] && [[ ${shell} != "zsh" ]] \
&& [[ ${shell} != "fish" ]]; then
echo "Unsupported shell (${shell}). Only Bash and Zsh shells are supported." echo "Unsupported shell (${shell}). Only Bash and Zsh shells are supported."
exit 1 exit 1
fi fi
@ -216,6 +217,7 @@ mkdir -p ${destdir}etc/profile.d/ || exit 1
cp -v ./bin/autojump.sh ${destdir}etc/profile.d/ || exit 1 cp -v ./bin/autojump.sh ${destdir}etc/profile.d/ || exit 1
cp -v ./bin/autojump.bash ${destdir}etc/profile.d/ || exit 1 cp -v ./bin/autojump.bash ${destdir}etc/profile.d/ || exit 1
cp -v ./bin/autojump.zsh ${destdir}etc/profile.d/ || exit 1 cp -v ./bin/autojump.zsh ${destdir}etc/profile.d/ || exit 1
cp -v ./bin/autojump.fish ${destdir}etc/profile.d/ || exit 1
mkdir -p ${destdir}${zshsharedir} || exit 1 mkdir -p ${destdir}${zshsharedir} || exit 1
# TODO: remove unused _j function (2013.02.01_1348, ting) # TODO: remove unused _j function (2013.02.01_1348, ting)
install -v -m 0755 ./bin/_j ${destdir}${zshsharedir} || exit 1 install -v -m 0755 ./bin/_j ${destdir}${zshsharedir} || exit 1
@ -232,9 +234,9 @@ if [[ `uname` == "Darwin" ]] && [[ ${shell} == "bash" ]]; then
rc_file="~/.bash_profile" rc_file="~/.bash_profile"
fi fi
aj_shell_file="${destdir}etc/profile.d/autojump.sh" aj_shell_file="${destdir}etc/profile.d/autojump.${shell}"
if [[ ${local} ]]; then if [[ ${local} ]]; then
aj_shell_file="~/.autojump/etc/profile.d/autojump.sh" aj_shell_file="~/.autojump/etc/profile.d/autojump.${shell}"
fi fi
echo echo