diff --git a/CHANGES.md b/CHANGES.md index 5741042..7a4b7df 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,7 @@ ## Summary of release changes, see commit history for more details: ## https://github.com/joelthelion/autojump/commits/master/ -### Release v22.0.0: +### Release v22.2.2: #### Backwards Incompatible @@ -22,6 +22,7 @@ - AUTOJUMP_DATA_DIR - AUTOJUMP_IGNORE_CASE - AUTOJUMP_KEEP_SYMLINKS +- misc bug fixes #### Features and Bug Fixes diff --git a/bin/autojump b/bin/autojump index 6dcda1f..9660128 100755 --- a/bin/autojump +++ b/bin/autojump @@ -60,7 +60,7 @@ from autojump_utils import sanitize from autojump_utils import take from autojump_utils import unico -VERSION = '22.2.1-beta' +VERSION = '22.2.4' FUZZY_MATCH_THRESHOLD = 0.6 TAB_ENTRIES_COUNT = 9 TAB_SEPARATOR = '__' diff --git a/bin/autojump.fish b/bin/autojump.fish index 0699417..2248d8f 100644 --- a/bin/autojump.fish +++ b/bin/autojump.fish @@ -13,16 +13,17 @@ complete -x -c j -a '(autojump --complete (commandline -t))' # set error file location if test (uname) = "Darwin" set -x AUTOJUMP_ERROR_PATH ~/Library/autojump/errors.log -else if test -d $XDG_DATA_HOME +else if test -d "$XDG_DATA_HOME" set -x AUTOJUMP_ERROR_PATH $XDG_DATA_HOME/autojump/errors.log else set -x AUTOJUMP_ERROR_PATH ~/.local/share/autojump/errors.log end -if test ! -d (dirname "$AUTOJUMP_ERROR_PATH") - mkdir -p (dirname "$AUTOJUMP_ERROR_PATH") +if test ! -d (dirname $AUTOJUMP_ERROR_PATH) + mkdir -p (dirname $AUTOJUMP_ERROR_PATH) end + # change pwd hook function __aj_add --on-variable PWD status --is-command-substitution; and return diff --git a/bin/autojump.sh b/bin/autojump.sh index 3a25edf..0ddff47 100644 --- a/bin/autojump.sh +++ b/bin/autojump.sh @@ -14,14 +14,13 @@ fi # prevent circular loop for sh shells if [ "${shell}" = "sh" ]; then - return 0 + return 0 # check local install elif [ -s ~/.autojump/share/autojump/autojump.${shell} ]; then - source ~/.autojump/share/autojump/autojump.${shell} + source ~/.autojump/share/autojump/autojump.${shell} # check global install elif [ -s /usr/local/share/autojump/autojump.${shell} ]; then - source /usr/local/share/autojump/autojump.${shell} - + source /usr/local/share/autojump/autojump.${shell} fi diff --git a/install.py b/install.py index 09fd557..90ea4f9 100755 --- a/install.py +++ b/install.py @@ -29,13 +29,13 @@ def mkdir(path, dryrun=False): os.makedirs(path) -def modify_autojump_sh(etc_dir, dryrun=False): +def modify_autojump_sh(etc_dir, share_dir, dryrun=False): """Append custom installation path to autojump.sh""" custom_install = "\ \n# check custom install \ \nif [ -s %s/autojump.${shell} ]; then \ - \n\tsource %s/autojump.${shell} \ - \nfi\n" % (etc_dir, etc_dir) + \n source %s/autojump.${shell} \ + \nfi\n" % (share_dir, share_dir) with open(os.path.join(etc_dir, 'autojump.sh'), 'a') as f: f.write(custom_install) @@ -207,7 +207,7 @@ def main(args): cp('./bin/_j', zshshare_dir, args.dryrun) if args.custom_install: - modify_autojump_sh(etc_dir, args.dryrun) + modify_autojump_sh(etc_dir, share_dir, args.dryrun) show_post_installation_message(etc_dir, share_dir, bin_dir)