Normalize *sum (md5sum et al) completions

7 files changed, 15 insertions, 19 deletions

diff --git a/share/completions/md5sum.fish b/share/completions/md5sum.fish
index 1e21ea80..3549e7c5 100644
--- a/share/completions/md5sum.fish
+++ b/share/completions/md5sum.fish
@@ -1 +1,10 @@
-__fish_complete_xsum md5sum
+complete -c md5sum -d "Compute and check message digest" -r
+complete -c md5sum -s b -l binary -d 'Read in binary mode'
+complete -c md5sum -s c -l check  -d "Read sums from files and check them"
+complete -c md5sum -s t -l text   -d 'Read in text mode'
+complete -c md5sum -l quiet       -d 'Don''t print OK for each successfully verified file'
+complete -c md5sum -l status      -d 'Don''t output anything, status code shows success'
+complete -c md5sum -s w -l warn   -d 'Warn about improperly formatted checksum lines'
+complete -c md5sum -l strict      -d 'With --check, exit non-zero for any invalid input'
+complete -c md5sum -l help        -d 'Display help text'
+complete -c md5sum -l version     -d 'Output version information and exit'
diff --git a/share/completions/sha1sum.fish b/share/completions/sha1sum.fish
index 88a3c95f..f6a0483f 100644
--- a/share/completions/sha1sum.fish
+++ b/share/completions/sha1sum.fish
@@ -1 +1 @@
-__fish_complete_xsum sha1sum
+complete -c sha1sum -w md5sum
diff --git a/share/completions/sha224sum.fish b/share/completions/sha224sum.fish
index 2b7b5a5f..a0b56cb2 100644
--- a/share/completions/sha224sum.fish
+++ b/share/completions/sha224sum.fish
@@ -1 +1 @@
-__fish_complete_xsum sha224sum
+complete -c sha224sum -w md5sum
diff --git a/share/completions/sha256sum.fish b/share/completions/sha256sum.fish
index 8af917f5..3d9f33cb 100644
--- a/share/completions/sha256sum.fish
+++ b/share/completions/sha256sum.fish
@@ -1 +1 @@
-__fish_complete_xsum sha256sum
+complete -c sha256sum -w md5sum
diff --git a/share/completions/sha384sum.fish b/share/completions/sha384sum.fish
index afb6c24b..3519e337 100644
--- a/share/completions/sha384sum.fish
+++ b/share/completions/sha384sum.fish
@@ -1 +1 @@
-__fish_complete_xsum sha384sum
+complete -c sha384sum -w md5sum
diff --git a/share/completions/sha512sum.fish b/share/completions/sha512sum.fish
index a5237b4b..cbf6afa4 100644
--- a/share/completions/sha512sum.fish
+++ b/share/completions/sha512sum.fish
@@ -1 +1 @@
-__fish_complete_xsum sha512sum
+complete -c sha512sum -w md5sum
diff --git a/share/functions/__fish_complete_xsum.fish b/share/functions/__fish_complete_xsum.fish
deleted file mode 100644
index 803e2b30..00000000
--- a/share/functions/__fish_complete_xsum.fish
+++ /dev/null
@@ -1,13 +0,0 @@
-function __fish_complete_xsum --description 'Complete md5sum sha1 etc' --argument-names cmd
-    complete -c $cmd -d "Compute and check $cmd message digest" -r
-    complete -c $cmd -s b -l binary -d 'Read in binary mode'
-    complete -c $cmd -s c -l check  -d "Read $cmd sums from files and check them"
-    complete -c $cmd -s t -l text   -d 'Read in text mode'
-    complete -c $cmd -l quiet       -d 'Don\'t print OK for each successfully verified file'
-    complete -c $cmd -l status      -d 'Don\'t output anything, status code shows success'
-    complete -c $cmd -s w -l warn   -d 'Warn about improperly formatted checksum lines'
-    complete -c $cmd -l strict      -d 'With --check, exit non-zero for any invalid input'
-    complete -c $cmd -l help        -d 'Display help text'
-    complete -c $cmd -l version     -d 'Output version information and exit'
-end
-