From 6a639d59b2fde97ed2a4447918fb2bf00a67f328 Mon Sep 17 00:00:00 2001 From: William Ting Date: Sat, 25 May 2013 05:23:01 -0700 Subject: [PATCH 1/2] update install.sh to support fish --- install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 259970d..66ae28b 100755 --- a/install.sh +++ b/install.sh @@ -147,7 +147,8 @@ if [[ -n ${prefix} ]]; then fi # 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." exit 1 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.bash ${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 # TODO: remove unused _j function (2013.02.01_1348, ting) install -v -m 0755 ./bin/_j ${destdir}${zshsharedir} || exit 1 From e22a346b569ed87cc091ccd59d9f44625b193053 Mon Sep 17 00:00:00 2001 From: William Ting Date: Tue, 4 Jun 2013 08:00:39 -0500 Subject: [PATCH 2/2] update install.sh to source shell specific file --- bin/autojump | 2 +- install.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/autojump b/bin/autojump index e6ed9ee..f747441 100755 --- a/bin/autojump +++ b/bin/autojump @@ -199,7 +199,7 @@ class Database: def set_defaults(): config = {} - config['version'] = 'release-v21.6.8' + config['version'] = 'release-v21.7.0' config['max_paths'] = 1000 config['separator'] = '__' config['home'] = os.path.expanduser('~') diff --git a/install.sh b/install.sh index 66ae28b..31ad883 100755 --- a/install.sh +++ b/install.sh @@ -234,9 +234,9 @@ if [[ `uname` == "Darwin" ]] && [[ ${shell} == "bash" ]]; then rc_file="~/.bash_profile" fi -aj_shell_file="${destdir}etc/profile.d/autojump.sh" +aj_shell_file="${destdir}etc/profile.d/autojump.${shell}" if [[ ${local} ]]; then - aj_shell_file="~/.autojump/etc/profile.d/autojump.sh" + aj_shell_file="~/.autojump/etc/profile.d/autojump.${shell}" fi echo