Merge pull request #740 from scop/style/nz

style: prefer empty/`!` over `-n`/`-z`

Author: scop

bash_completion

@@ -624,7 +624,7 @@ _filedir()
         local opts=(-f -X "$xspec")
         [[ $xspec ]] && plusdirs=(-o plusdirs)
         [[ ${BASH_COMPLETION_FILEDIR_FALLBACK-${COMP_FILEDIR_FALLBACK-}} ||
-            -z ${plusdirs-} ]] ||
+            ! ${plusdirs-} ]] ||
             opts+=("${plusdirs[@]}")
 
         reset=$(shopt -po noglob)
@@ -636,7 +636,7 @@ _filedir()
 
         # Try without filter if it failed to produce anything and configured to
         [[ ${BASH_COMPLETION_FILEDIR_FALLBACK-${COMP_FILEDIR_FALLBACK-}} &&
-            -n $arg && ${#toks[@]} -lt 1 ]] && {
+            $arg && ${#toks[@]} -lt 1 ]] && {
             reset=$(shopt -po noglob)
             set -o noglob
             toks+=($(compgen -f ${plusdirs+"${plusdirs[@]}"} -- $quoted))
@@ -1567,7 +1567,7 @@ _fstypes()
              $([[ -d /etc/fs ]] && command ls /etc/fs)"
     fi
 
-    [[ -n $fss ]] && COMPREPLY+=($(compgen -W "$fss" -- "$cur"))
+    [[ $fss ]] && COMPREPLY+=($(compgen -W "$fss" -- "$cur"))
 }
 
 # Get real command.
@@ -1952,7 +1952,7 @@ _known_hosts_real()
 
     # Add results of normal hostname completion, unless
     # `BASH_COMPLETION_KNOWN_HOSTS_WITH_HOSTFILE' is set to an empty value.
-    if [[ -n ${BASH_COMPLETION_KNOWN_HOSTS_WITH_HOSTFILE-${COMP_KNOWN_HOSTS_WITH_HOSTFILE-1}} ]]; then
+    if [[ ${BASH_COMPLETION_KNOWN_HOSTS_WITH_HOSTFILE-${COMP_KNOWN_HOSTS_WITH_HOSTFILE-1}} ]]; then
         COMPREPLY+=(
             $(compgen -A hostname -P "$prefix" -S "$suffix" -- "$cur"))
     fi
@@ -1993,7 +1993,7 @@ _cd()
 
     # Use standard dir completion if no CDPATH or parameter starts with /,
     # ./ or ../
-    if [[ -z ${CDPATH:-} || $cur == ?(.)?(.)/* ]]; then
+    if [[ ! ${CDPATH:-} || $cur == ?(.)?(.)/* ]]; then
         _filedir -d
         return
     fi
@@ -2136,7 +2136,7 @@ _command_offset()
                     # Note: When completion spec is removed after 124, we do
                     # not generate any completions including the default ones.
                     # This is the behavior of the original Bash progcomp.
-                    [[ -n $cspec ]] || break
+                    [[ $cspec ]] || break
 
                     continue
                 fi
@@ -2267,7 +2267,7 @@ _filedir_xspec()
     toks+=($(
         eval compgen -f -X "'!$xspec'" -- '$(quote_readline "$cur")' | {
             while read -r tmp; do
-                [[ -n $tmp ]] && printf '%s\n' $tmp
+                [[ $tmp ]] && printf '%s\n' $tmp
             done
         }
     ))
@@ -2372,7 +2372,7 @@ __load_completion()
 {
     local -a dirs=(${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions)
     local IFS=: dir cmd="${1##*/}" compfile
-    [[ -n $cmd ]] || return 1
+    [[ $cmd ]] || return 1
     for dir in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do
         dirs+=($dir/bash-completion/completions)
     done

completions/_mount

@@ -42,7 +42,7 @@ _mount()
     if [[ $cur == //* ]]; then
         host=${cur#//}
         host=${host%%/*}
-        if [[ -n $host ]]; then
+        if [[ $host ]]; then
             COMPREPLY=($(compgen -P "//$host" -W \
                 "$(smbclient -d 0 -NL $host 2>/dev/null |
                     command sed -ne '/^[[:blank:]]*Sharename/,/^$/p' |

completions/_mount.linux

@@ -236,7 +236,7 @@ _mount()
     if [[ $cur == //* ]]; then
         host=${cur#//}
         host=${host%%/*}
-        if [[ -n $host ]]; then
+        if [[ $host ]]; then
             COMPREPLY=($(compgen -P "//$host" -W \
                 "$(smbclient -d 0 -NL $host 2>/dev/null |
                     command sed -ne '/^[[:blank:]]*Sharename/,/^$/p' |

completions/abook

@@ -6,7 +6,7 @@ _abook()
     _init_completion || return
 
     # abook only takes options, tabbing after command name adds a single dash
-    [[ $cword -eq 1 && -z $cur ]] &&
+    [[ $cword -eq 1 && ! $cur ]] &&
         {
             compopt -o nospace
             COMPREPLY=("-")

completions/carton

@@ -39,7 +39,7 @@ _carton()
             return
             ;;
         --help | -h)
-            [[ -n $command ]] || _carton_commands "$1"
+            [[ $command ]] || _carton_commands "$1"
             return
             ;;
         --cpanfile)

completions/cppcheck

@@ -35,7 +35,7 @@ _cppcheck()
             ;;
         --file-list)
             _filedir
-            [[ -z $cur || $cur == - ]] && COMPREPLY+=(-)
+            [[ ! $cur || $cur == - ]] && COMPREPLY+=(-)
             return
             ;;
         -I)

completions/cryptsetup

@@ -35,7 +35,7 @@ _cryptsetup()
 
     local arg
     _get_first_arg
-    if [[ -z $arg ]]; then
+    if [[ ! $arg ]]; then
         if [[ $cur == -* ]]; then
             COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
             [[ ${COMPREPLY-} == *= ]] && compopt -o nospace

completions/cvs

@@ -13,7 +13,7 @@ _cvs_entries()
 
 _cvs_modules()
 {
-    if [[ -n $prefix ]]; then
+    if [[ $prefix ]]; then
         COMPREPLY=($(command ls -d ${cvsroot}/${prefix}/!(CVSROOT)))
     else
         COMPREPLY=($(command ls -d ${cvsroot}/!(CVSROOT)))
@@ -152,7 +152,7 @@ _cvs()
 
             if [[ $cur != -* ]]; then
                 _cvs_entries
-                [[ -z $cur ]] && files=(!(CVS)) ||
+                [[ ! $cur ]] && files=(!(CVS)) ||
                     files=($(command ls -d ${cur}* 2>/dev/null))
                 local f
                 for i in "${!files[@]}"; do
@@ -251,7 +251,7 @@ _cvs()
                 # if $BASH_COMPLETION_CMD_CVS_REMOTE is not null, 'cvs commit'
                 # will complete on remotely checked-out files (requires
                 # passwordless access to the remote repository
-                if [[ -n ${BASH_COMPLETION_CMD_CVS_REMOTE-${COMP_CVS_REMOTE-}} ]]; then
+                if [[ ${BASH_COMPLETION_CMD_CVS_REMOTE-${COMP_CVS_REMOTE-}} ]]; then
                     # this is the least computationally intensive way found so
                     # far, but other changes (something other than
                     # changed/removed/new) may be missing

completions/dict

@@ -17,15 +17,15 @@ _dict()
         case ${words[i]} in
             --host | -!(-*)h)
                 host=${words[++i]}
-                [[ -n $host ]] && host="-h $host"
+                [[ $host ]] && host="-h $host"
                 ;;
             --port | -!(-*)p)
                 port=${words[++i]}
-                [[ -n $port ]] && port="-p $port"
+                [[ $port ]] && port="-p $port"
                 ;;
             --database | -!(-*)d)
                 db=${words[++i]}
-                [[ -n $db ]] && host="-d $db"
+                [[ $db ]] && host="-d $db"
                 ;;
         esac
     done

completions/ebtables

@@ -20,7 +20,7 @@ _ebtables()
             COMPREPLY=($(compgen -W 'nat filter broute' -- "$cur"))
             ;;
         -!(-*)j)
-            if [[ $table == "-t filter" || -z $table ]]; then
+            if [[ $table == "-t filter" || ! $table ]]; then
                 COMPREPLY=($(compgen -W '$targets
                 $("$1" $table -L 2>/dev/null | \
                   command sed -n -e "s/INPUT\|OUTPUT\|FORWARD//" \