bzip2, gzip, and other compressors: Use _tilde instead of _expand

scop · Mar 16, 2018 · 3c4fc36 · 3c4fc36
1 parent ec85ac4
commit 3c4fc36
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 12 deletions.
diff --git a/completions/bzip2 b/completions/bzip2
@@ -32,7 +32,7 @@ _bzip2()
         [[ "$prev" == -*z* ]] && xspec=
     fi
 
-    _expand || return
+    _tilde "$cur" || return
 
     compopt -o filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \

diff --git a/completions/gzip b/completions/gzip
@@ -33,7 +33,7 @@ _gzip()
         [[ "$prev" == -*f* ]] && xspec=
     fi
 
-    _expand || return
+    _tilde "$cur" || return
 
     compopt -o filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \

diff --git a/completions/lrzip b/completions/lrzip
@@ -36,13 +36,13 @@ _lrzip()
             ;;
     esac
 
-    _expand || return
-
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
         return
     fi
 
+    _tilde "$cur" || return
+
     local IFS=$'\n'
     compopt -o filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \

diff --git a/completions/lz4 b/completions/lz4
@@ -42,7 +42,8 @@ _lz4()
         esac
     done
 
-    _expand || return
+    _tilde "$cur" || return
+
     local IFS=$'\n'
     compopt -o filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \

diff --git a/completions/lzma b/completions/lzma
@@ -24,7 +24,7 @@ _lzma()
         [[ "$prev" == -*z* ]] && xspec=
     fi
 
-    _expand || return
+    _tilde "$cur" || return
 
     compopt -o filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \

diff --git a/completions/lzop b/completions/lzop
@@ -48,7 +48,7 @@ _lzop()
             ;;
     esac
 
-    _expand || return
+    _tilde "$cur" || return
 
     local IFS=$'\n'
     compopt -o filenames

diff --git a/completions/xz b/completions/xz
@@ -40,15 +40,15 @@ _xz()
 
     $split && return
 
-    _expand || return
-
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" --long-help ) {-1..-9}' \
             -- "$cur" ) )
         [[ $COMPREPLY == *= ]] && compopt -o nospace
         return
     fi
 
+    _tilde "$cur" || return
+
     local IFS=$'\n'
     compopt -o filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \

diff --git a/completions/zopfli b/completions/zopfli
@@ -18,10 +18,9 @@ _zopfli()
         return
     fi
 
-    local IFS=$'\n' xspec="*.@(gz|t[ag]z)"
-
-    _expand || return
+    _tilde "$cur" || return
 
+    local IFS=$'\n' xspec="*.@(gz|t[ag]z)"
     compopt -o filenames
     COMPREPLY=( $( compgen -f -X "$xspec" -- "$cur" ) \
         $( compgen -d -- "$cur" ) )

diff --git a/test/lib/completions/bzip2.exp b/test/lib/completions/bzip2.exp
@@ -17,4 +17,8 @@ assert_complete_any "bzip2 "
 sync_after_int
 
 
+assert_complete_homedir "bzip"
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/gzip.exp b/test/lib/completions/gzip.exp
@@ -25,4 +25,8 @@ expect {
 sync_after_int
 
 
+assert_complete_homedir "gzip"
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/lrzip.exp b/test/lib/completions/lrzip.exp
@@ -17,4 +17,8 @@ assert_complete_any "lrzip "
 sync_after_int
 
 
+assert_complete_homedir "lrzip"
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/lz4.exp b/test/lib/completions/lz4.exp
@@ -14,5 +14,8 @@ setup
 assert_complete_any "lz4 "
 sync_after_int
 
+assert_complete_homedir "lz4"
+sync_after_int
+
 
 teardown
diff --git a/test/lib/completions/lzma.exp b/test/lib/completions/lzma.exp
@@ -23,4 +23,8 @@ assert_complete "a/ bashcomp.lzma bashcomp.tlz" "lzma -d $::srcdir/fixtures/xz/"
 sync_after_int
 
 
+assert_complete_homedir "lzma"
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/lzop.exp b/test/lib/completions/lzop.exp
@@ -17,4 +17,8 @@ assert_complete_any "lzop "
 sync_after_int
 
 
+assert_complete_homedir "lzop"
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/xz.exp b/test/lib/completions/xz.exp
@@ -30,4 +30,8 @@ assert_complete_dir "a/ bashcomp.tar" "xz " $::srcdir/fixtures/xz
 sync_after_int
 
 
+assert_complete_homedir "xz"
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/zopfli.exp b/test/lib/completions/zopfli.exp
@@ -15,4 +15,8 @@ assert_complete_any "zopfli "
 sync_after_int
 
 
+assert_complete_homedir "zopfli"
+sync_after_int
+
+
 teardown