mirror of
https://github.com/wting/autojump
synced 2024-10-27 20:34:07 +00:00
Fixed some bugs in fish script
OSTYPE was not being set correctly. It is in bash, not sh. Since the value is unlikely to change, I read it once and stored it globally Test logic was backward in jo function, causing error to always be printed, unless you did NOT specify a directory name.
This commit is contained in:
parent
8b525c1b55
commit
f09d23e30d
@ -5,6 +5,11 @@ if test -d ~/.autojump
|
||||
set -x PATH ~/.autojump/bin $PATH
|
||||
end
|
||||
|
||||
# Set ostype, if not set
|
||||
if not set -q OSTYPE
|
||||
set -gx OSTYPE (bash -c 'echo ${OSTYPE}')
|
||||
end
|
||||
|
||||
|
||||
# enable tab completion
|
||||
complete -x -c j -a '(autojump --complete (commandline -t))'
|
||||
@ -34,7 +39,7 @@ end
|
||||
# misc helper functions
|
||||
function __aj_err
|
||||
# TODO(ting|#247): set error file location
|
||||
echo $argv 1>&2; false
|
||||
echo -e $argv 1>&2; false
|
||||
end
|
||||
|
||||
# default autojump command
|
||||
@ -73,11 +78,7 @@ end
|
||||
function jo
|
||||
set -l output (autojump $argv)
|
||||
if test -d "$output"
|
||||
__aj_err "autojump: directory '"$argv"' not found"
|
||||
__aj_err "\n$output\n"
|
||||
__aj_err "Try `autojump --help` for more information."
|
||||
else
|
||||
switch (sh -c 'echo ${OSTYPE}')
|
||||
switch $OSTYPE
|
||||
case 'linux*'
|
||||
xdg-open (autojump $argv)
|
||||
case 'darwin*'
|
||||
@ -85,9 +86,12 @@ function jo
|
||||
case cygwin
|
||||
cygstart "" (cygpath -w -a (pwd))
|
||||
case '*'
|
||||
__aj_error "Unknown operating system: '"$OSTYPE"'"
|
||||
__aj_error "Unknown operating system: \"$OSTYPE\""
|
||||
end
|
||||
echo end
|
||||
else
|
||||
__aj_err "autojump: directory '"$argv"' not found"
|
||||
__aj_err "\n$output\n"
|
||||
__aj_err "Try `autojump --help` for more information."
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user