fix(puppet,valgrind): work around localvar_inherit

Author: akinomyoga

completions/puppet

@@ -65,7 +65,7 @@ _comp_cmd_puppet()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    local subcommand action
+    local subcommand="" action
 
     case $prev in
         -h | --help | -V | --version)

completions/valgrind

@@ -13,7 +13,7 @@ _comp_cmd_valgrind()
         fi
     done
 
-    local word tool
+    local word tool=""
     for word in "${words[@]:1}"; do
         if [[ $word == --tool=?* ]]; then
             tool=$word
@@ -70,7 +70,7 @@ _comp_cmd_valgrind()
             # generic cases parsed from --help output
         --+([-A-Za-z0-9_]))
             # shellcheck disable=SC2086
-            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
@@ -101,7 +101,7 @@ _comp_cmd_valgrind()
     [[ $was_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