aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile7
-rw-r--r--README.md4
-rw-r--r--completions/sail.fish10
3 files changed, 16 insertions, 5 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7c1b7ed
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+PREFIX ?= /usr/local
+
+install: completions/sail.fish functions/sail.fish
+ install -D -m 755 -t '${DESTDIR}${PREFIX}/share/fish/vendor_functions.d/' functions/sail.fish
+ install -D -m 644 -t '${DESTDIR}${PREFIX}/share/fish/vendor_completions.d/' completions/sail.fish
+
+.PHONY: install
diff --git a/README.md b/README.md
index 522247c..ba737eb 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ shell.
## Installation
-Merge both `functions/` and `completions/` into your `~/.config/fish/` or
-`$XDG_CONFIG_HOME/fish/` directory.
+Use the provided `Makefile`. To install locally, run `PREFIX=~/.local make
+install`.
## Usage
diff --git a/completions/sail.fish b/completions/sail.fish
index f820ba7..e6404a7 100644
--- a/completions/sail.fish
+++ b/completions/sail.fish
@@ -1,6 +1,6 @@
-complete -c sail -rs a -l add -d 'Add a jump for the current directory'
-complete -c sail -s e -l edit -d 'Edit the jump file'
-complete -c sail -s p -l print -d 'Print the jump file'
+complete -c sail -n 'not __sailfish_has_options' -rs a -l add -d 'Add a jump for the current directory'
+complete -c sail -n 'not __sailfish_has_options' -s e -l edit -d 'Edit the jump file'
+complete -c sail -n 'not __sailfish_has_options' -s p -l print -d 'Print the jump file'
complete -x -c sail -a "(__sailfish_suggest)"
@@ -14,3 +14,7 @@ function __sailfish_suggest
cat $jumps
end
+
+function __sailfish_has_options
+ __fish_contains_opt -s a add -s e edit -s p print
+end