completions/fish: use @@Prefix@@

void-linux · Apr 13, 2023 · eb725c9 · eb725c9
1 parent a5d67fa
commit eb725c9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ xmirror
 .help
 _site/
 completions/_xmirror
+completions/xmirror.fish
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ xmirror: xmirror.in
 	chmod +x $@+
 	mv $@+ $@
 
-completions: completions/_xmirror
+completions: completions/_xmirror completions/xmirror.fish
 
 completions/%: completions/%.in
 	sed -e "s,@@PREFIX@@,$(PREFIX),g" $< >$@
@@ -25,7 +25,7 @@ install: all
 	install -Dm 644 xmirror.1 -t $(DESTDIR)$(PREFIX)/share/man/man1
 
 clean:
-	rm -rf xmirror _site completions/_xmirror
+	rm -rf xmirror _site completions/_xmirror completions/xmirror.fish
 
 README: xmirror.1
 	mandoc -Tutf8 $< | col -bx >$@

diff --git a/completions/xmirror.fish → completions/xmirror.fish.in b/completions/xmirror.fish → completions/xmirror.fish.in
@@ -1,7 +1,7 @@
 complete -c xmirror -f
 
 function __xmirror_complete_mirrors
-    string match -vr '^\s*#' </usr/share/xmirror/mirrors.lst | while read -l line
+    string match -vr '^\s*#' <@@PREFIX@@/share/xmirror/mirrors.lst | while read -l line
         set -l values (string split \t -- $line)
         # Mirror url, location, and tier
         echo -- $values[2]\t$values[3], Tier $values[4]