*: avoid more errors in nounset mode

Refs scop#44

Author: scop

bash_completion

@@ -1641,7 +1641,7 @@ _known_hosts_real()
     kh=()
 
     # ssh config files
-    if [[ -n $configfile ]]; then
+    if [[ -v configfile ]]; then
         [[ -r $configfile ]] && config+=("$configfile")
     else
         for i in /etc/ssh/ssh_config ~/.ssh/config ~/.ssh2/config; do
@@ -1679,7 +1679,7 @@ _known_hosts_real()
         done
     fi
 
-    if [[ -z $configfile ]]; then
+    if [[ ! -v configfile ]]; then
         # Global and user known_hosts files
         for i in /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 \
             /etc/known_hosts /etc/known_hosts2 ~/.ssh/known_hosts \

completions/_adb

@@ -33,7 +33,7 @@ _adb()
         fi
     done
 
-    if [[ ! $cmd ]]; then
+    if [[ ! -v cmd ]]; then
         local tmp=()
         if [[ ! $cur || $cur == -* ]]; then
             tmp+=($(compgen -W '$(_parse_help "$1" help)' -- "$cur"))

completions/ant

@@ -77,7 +77,7 @@ _ant()
             fi
         done
         if ((i == cword)); then
-            for i in $ANT_ARGS; do
+            for i in ${ANT_ARGS-}; do
                 if [[ $prev == -@(?(build)file|f) ]]; then
                     buildfile=$i
                     break

completions/apt-build

@@ -13,7 +13,7 @@ _apt_build()
         fi
     done
 
-    if [[ -n $special ]]; then
+    if [[ -v special ]]; then
         case $special in
             install | source | info)
                 COMPREPLY=($(_xfunc apt-cache _apt_cache_packages))

completions/carton

@@ -29,7 +29,7 @@ _carton()
         esac
     done
 
-    if [[ -z $command ]]; then
+    if [[ ! -v command ]]; then
         _carton_commands "$1"
         return
     fi

completions/dmypy

@@ -23,7 +23,7 @@ _dmypy()
         fi
     done
 
-    case $cmd in
+    case ${cmd-} in
         check | run)
             _filedir '@(py|pyi)'
             return
@@ -35,7 +35,7 @@ _dmypy()
         return
     fi
 
-    if [[ ! $cmd ]]; then
+    if [[ ! -v cmd ]]; then
         local cmds=$($1 --help 2>&1 |
             command sed -ne '/positional arguments/{p;n;p;q}' |
             command sed -ne 's/{\(.*\)}/\1/p')

completions/valgrind

@@ -70,7 +70,7 @@ _valgrind()
             ;;
             # generic cases parsed from --help output
         --+([-A-Za-z0-9_]))
-            local value=$($1 --help-debug $tool 2>/dev/null |
+            local value=$($1 --help-debug ${tool-} 2>/dev/null |
                 command sed -ne "s|^[[:blank:]]*$prev=\([^[:blank:]]\{1,\}\).*|\1|p")
             case $value in
                 \<file*\>)
@@ -100,7 +100,7 @@ _valgrind()
     $split && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help $tool")' \
+        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help ${tool-}")' \
             -- "$cur"))
         [[ $COMPREPLY == *= ]] && compopt -o nospace
         return

completions/xrandr

@@ -24,7 +24,7 @@ _xrandr()
                     break
                 fi
             done
-            if [[ $output ]]; then
+            if [[ -v output ]]; then
                 local modes=$("$1" | command sed -e "1,/^$output / d" \
                     -e "/connected/,$ d" \
                     -e "s/\([^[:space:]]\)[[:space:]].*/\1/")

test/t/conftest.py

@@ -496,7 +496,7 @@ def assert_complete(
         # Back up environment and apply new one
         assert_bash_exec(
             bash,
-            " ".join('%s%s="$%s"' % (env_prefix, k, k) for k in env.keys()),
+            " ".join('%s%s="${%s-}"' % (env_prefix, k, k) for k in env.keys()),
         )
         assert_bash_exec(
             bash,