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 pull request #366 from CodeMonk/master

Browse Source 
Set OSTYPE correctly for fish wrapper.
This commit is contained in:
William Ting 2015-06-10 06:44:39 -07:00
commit ffe22e1838
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bin/autojump.fish
View File

@ -5,6 +5,11 @@ if test -d ~/.autojump
set -x PATH ~/.autojump/bin $PATH set -x PATH ~/.autojump/bin $PATH
end end
# Set ostype, if not set
if not set -q OSTYPE
set -gx OSTYPE (bash -c 'echo ${OSTYPE}')
end
# enable tab completion # enable tab completion
complete -x -c j -a '(autojump --complete (commandline -t))' complete -x -c j -a '(autojump --complete (commandline -t))'
@ -34,7 +39,7 @@ end
# misc helper functions # misc helper functions
function __aj_err function __aj_err
# TODO(ting|#247): set error file location # TODO(ting|#247): set error file location
echo $argv 1>&2; false echo -e $argv 1>&2; false
end end
# default autojump command # default autojump command
@ -44,15 +49,20 @@ function j
autojump $argv autojump $argv
case '*' case '*'
set -l output (autojump $argv) set -l output (autojump $argv)
if test -d "$output" # Check for . and attempt a regular cd
set_color red if [ $output = "." ]
echo $output cd $argv
set_color normal
cd $output
else else
__aj_err "autojump: directory '"$argv"' not found" if test -d "$output"
__aj_err "\n$output\n" set_color red
__aj_err "Try `autojump --help` for more information." echo $output
set_color normal
cd $output
else
__aj_err "autojump: directory '"$argv"' not found"
__aj_err "\n$output\n"
__aj_err "Try `autojump --help` for more information."
end
end end
end end
end end
@ -73,11 +83,7 @@ end
function jo function jo
set -l output (autojump $argv) set -l output (autojump $argv)
if test -d "$output" if test -d "$output"
__aj_err "autojump: directory '"$argv"' not found" switch $OSTYPE
__aj_err "\n$output\n"
__aj_err "Try `autojump --help` for more information."
else
switch (sh -c 'echo ${OSTYPE}')
case 'linux*' case 'linux*'
xdg-open (autojump $argv) xdg-open (autojump $argv)
case 'darwin*' case 'darwin*'
@ -85,9 +91,12 @@ function jo
case cygwin case cygwin
cygstart "" (cygpath -w -a (pwd)) cygstart "" (cygpath -w -a (pwd))
case '*' case '*'
__aj_error "Unknown operating system: '"$OSTYPE"'" __aj_error "Unknown operating system: \"$OSTYPE\""
end 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
end end