_upvar, _upvars, _variables, rpm: address shellcheck SC1083

scop · Apr 10, 2020 · e043fac · e043fac
1 parent 49ac2d9
commit e043fac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/bash_completion b/bash_completion
@@ -168,7 +168,7 @@ _upvar()
         if (( $# == 2 )); then
             eval $1=\"\$2\"          # Return single value
         else
-            eval $1=\(\"\${@:2}\"\)  # Return array
+            eval $1=\(\"\$"{@:2}"\"\) # Return array
         fi
     fi
 }
@@ -199,7 +199,7 @@ _upvars()
                     "$FUNCNAME: \`$1': invalid number specifier" >&2
                     return 1; }
                 # Assign array of -aN elements
-                [[ "$2" ]] && unset -v "$2" && eval $2=\(\"\${@:3:${1#-a}}\"\) &&
+                [[ "$2" ]] && unset -v "$2" && eval $2=\(\"\$"{@:3:${1#-a}}"\"\) &&
                 shift $((${1#-a} + 2)) || { echo bash_completion: \
                     "$FUNCNAME: \`$1${2+ }$2': missing argument(s)" \
                     >&2; return 1; }
@@ -626,7 +626,7 @@ _variables()
 {
     if [[ $cur =~ ^(\$(\{[!#]?)?)([A-Za-z0-9_]*)$ ]]; then
         # Completing $var / ${var / ${!var / ${#var
-        if [[ $cur == \${* ]]; then
+        if [[ $cur == "\${"* ]]; then
             local arrs vars
             vars=( $(compgen -A variable -P ${BASH_REMATCH[1]} -S '}' -- ${BASH_REMATCH[3]}) ) && \
             arrs=( $(compgen -A arrayvar -P ${BASH_REMATCH[1]} -S '[' -- ${BASH_REMATCH[3]}) )

diff --git a/completions/rpm b/completions/rpm
@@ -96,15 +96,15 @@ _rpm()
                 # complete on capabilities
                 local IFS=$'\n' fmt
                 case $prev in
-                    *enhances) fmt=ENHANCENAME ;;
-                    *provides) fmt=PROVIDENAME ;;
-                    *recommends) fmt=RECOMMENDNAME ;;
-                    *requires) fmt=REQUIRENAME ;;
-                    *suggests) fmt=SUGGESTNAME ;;
-                    *supplements) fmt=SUPPLEMENTNAME ;;
+                    *enhances) fmt="%{ENHANCENAME}" ;;
+                    *provides) fmt="%{PROVIDENAME}" ;;
+                    *recommends) fmt="%{RECOMMENDNAME}" ;;
+                    *requires) fmt="%{REQUIRENAME}" ;;
+                    *suggests) fmt="%{SUGGESTNAME}" ;;
+                    *supplements) fmt="%{SUPPLEMENTNAME}" ;;
                 esac
                 COMPREPLY=( $(compgen -W "$($1 -qa --nodigest --nosignature \
-                    --queryformat=\"%{$fmt}\\n\" 2>/dev/null |
+                    --queryformat=\"$fmt\\n\" 2>/dev/null |
                     command grep -vF '(none)')" -- "$cur") )
             fi
             return