From d18e1c7bcaddf025fa57402e7fde1ec8a7a0527c Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sun, 13 Dec 2020 07:28:53 +0100 Subject: [PATCH] Revert "completions/unzip: Stop filtering suffixes" This reverts commit 46068cd257c36ee63b718f3696f64f417fb97bb5. --- share/completions/unzip.fish | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/share/completions/unzip.fish b/share/completions/unzip.fish index 09b0c610e..aa0fb52e9 100644 --- a/share/completions/unzip.fish +++ b/share/completions/unzip.fish @@ -26,7 +26,25 @@ complete -c unzip -s M -d "pipe through `more` pager" # Debian version of unzip if unzip -v 2>/dev/null | string match -eq Debian - # Files after the first token are either files to include or exclude from the operation + + # the first non-switch argument should be the zipfile + complete -c unzip -n __fish_is_first_token -xa '( + __fish_complete_suffix .zip + __fish_complete_suffix .jar + __fish_complete_suffix .aar + )' + + # Files thereafter are either files to include or exclude from the operation set -l zipfile complete -c unzip -n 'not __fish_is_first_token' -xa '(unzip -l (eval set zipfile (__fish_first_token); echo $zipfile) | string replace -r --filter ".*:\S+\s+(.*)" "\$1")' + +else + + # all tokens should be zip files + complete -c unzip -xa '( + __fish_complete_suffix .zip + __fish_complete_suffix .jar + __fish_complete_suffix .aar + )' + end