From: Dave Reisner <dreisner@archlinux.org>
Date: Sat, 20 Oct 2012 21:54:08 +0000 (-0400)
Subject: bash-completion: ensure iterators are locally scoped
X-Git-Tag: v195~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a632a03076dd254bd967011b68d91b131ce88606

bash-completion: ensure iterators are locally scoped

Avoids leaking the 'i' variable to the user's shell session.
---

diff --git a/bash-completion/systemd-bash-completion.sh b/bash-completion/systemd-bash-completion.sh
index 1a7df5764..a03433269 100644
--- a/bash-completion/systemd-bash-completion.sh
+++ b/bash-completion/systemd-bash-completion.sh
@@ -55,7 +55,7 @@ __get_masked_units   () { __systemctl list-unit-files  \
 
 _systemctl () {
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local verb comps
+        local i verb comps
 
         local -A OPTS=(
                [STANDALONE]='--all -a --defaults --fail --ignore-dependencies --failed --force -f --full --global
@@ -203,7 +203,7 @@ __get_all_seats    () { loginctl list-seats    | { while read -r a b; do printf
 
 _loginctl () {
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local verb comps
+        local i verb comps
 
         local -A OPTS=(
                [STANDALONE]='--all -a --help -h --no-pager --privileged -P --version'
@@ -341,7 +341,7 @@ _journalctl() {
 complete -F _journalctl journalctl
 
 _timedatectl() {
-        local verb comps
+        local i verb comps
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
         local OPTS='-h --help --version --adjust-system-clock --no-pager
                     --no-ask-password -H --host'
@@ -391,7 +391,7 @@ _timedatectl() {
 complete -F _timedatectl timedatectl
 
 _localectl() {
-        local verb comps
+        local i verb comps
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
         local OPTS='-h --help --version --no-convert --no-pager --no-ask-password
                     -H --host'
@@ -441,7 +441,7 @@ _localectl() {
 complete -F _localectl localectl
 
 _hostnamectl() {
-        local verb comps
+        local i verb comps
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
         local OPTS='-h --help --version --transient --static --pretty
                     --no-ask-password -H --host'