aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2014-11-30 23:31:53 -0800
committerTim Harder <radhermit@gentoo.org>2014-11-30 23:33:42 -0800
commit1dc4fb5541cb73c1f203290a69d0d1150a01d285 (patch)
tree10c4bfa24a43e778cebd92762fbc8d7c9447ee3b /src/_gentoo_packages
parent_portage_utils: sync portdir/reposconf changes from _gentoo_packages (diff)
downloadzsh-completion-1dc4fb5541cb73c1f203290a69d0d1150a01d285.tar.gz
zsh-completion-1dc4fb5541cb73c1f203290a69d0d1150a01d285.tar.bz2
zsh-completion-1dc4fb5541cb73c1f203290a69d0d1150a01d285.zip
_gentoo_packages: remove unnecessary semicolons
We should try to remain consistent in stylistic coding patterns.
Diffstat (limited to 'src/_gentoo_packages')
-rw-r--r--src/_gentoo_packages50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/_gentoo_packages b/src/_gentoo_packages
index 9a747b7..a8a3aff 100644
--- a/src/_gentoo_packages
+++ b/src/_gentoo_packages
@@ -42,25 +42,25 @@ _portdir() {
}
_parsereposconf() {
- local v f insection section arr;
+ local v f insection section arr
for f in /usr/share/portage/config/repos.conf \
/etc/portage/repos.conf \
/etc/portage/repos.conf/*.conf; do
[[ -f ${f} ]] || continue
- insection=0;
- declare -A arr;
- IFS='= ';
+ insection=0
+ declare -A arr
+ IFS='= '
while read -r name value; do
[[ -z ${name} || ${name} == '#'* ]] && continue
if [[ (${name} == '['*']') && (-z ${value}) ]]; then
- value=${name//(\]|\[)};
- name="section";
- fi;
- arr[${name}]=${value};
+ value=${name//(\]|\[)}
+ name="section"
+ fi
+ arr[${name}]=${value}
if [[ ${insection} == 1 && ${name} == "section" ]]; then
break
@@ -69,7 +69,7 @@ _parsereposconf() {
secname+=(${value})
elif [[ ${insection} == 1 ]]; then
if [[ ${name} == ${2} ]]; then
- v=${value};
+ v=${value}
fi
fi
continue
@@ -86,10 +86,10 @@ _parsereposconf() {
_parsesetsconf() {
[[ -d ${1} ]] || continue
- local v f places sections setsconf insection section arr;
+ local v f places sections setsconf insection section arr
if [[ -d ${1}/sets ]]; then
- setsconf=(${1}/sets/*.conf(N));
+ setsconf=(${1}/sets/*.conf(N))
[[ (($#setsconf > 0)) ]] && places=(${setsconf})
elif [[ -f ${1}/sets.conf ]]; then
places=(${1}/sets.conf)
@@ -97,28 +97,28 @@ _parsesetsconf() {
for f in ${(@)places}; do
if [[ -r ${f} ]]; then
- insection=0;
- declare -A arr;
- IFS='= ';
+ insection=0
+ declare -A arr
+ IFS='= '
while read -r name value; do
[[ -z ${name} || ${name} == '#'* ]] && continue
if [[ (${name} == '['*']') && (-z ${value}) ]]; then
- value=${name//(\]|\[)};
- name="section";
- fi;
- arr[${name}]=${value};
+ value=${name//(\]|\[)}
+ name="section"
+ fi
+ arr[${name}]=${value}
if [[ ${insection} == 1 && ${name} == "section" ]]; then
[[ "sets" == ${2} ]] && [[ ! ${value} =~ "sets" ]] && sections+=(${value})
- insection=0;
+ insection=0
elif [[ ${name} == "section" ]]; then
[[ ${value} =~ "${1:t} sets" ]] && insection=1
[[ "sets" == ${2} ]] && [[ ! ${value} =~ "sets" ]] && sections+=(${value})
elif [[ ${insection} == 1 ]]; then
[[ "sets" == ${2} ]] && continue
if [[ ${name} == "directory" ]]; then
- v=${value};
+ v=${value}
fi
fi
continue
@@ -129,13 +129,13 @@ _parsesetsconf() {
if [[ "sets" == ${2} ]]; then
[[ ((${#sections} > 0)) ]] && echo ${(@)sections}
else
- [[ ((${#v} > 0)) ]] && echo ${v:t};
+ [[ ((${#v} > 0)) ]] && echo ${v:t}
fi
}
_gentoo_packages_update_installed_sets() {
- local sets;
- sets=($(</var/lib/portage/world_sets));
+ local sets
+ sets=($(</var/lib/portage/world_sets))
if [[ ((${#sets} > 0)) ]]; then
_wanted installed_sets expl 'installed set' compadd "$@" "${(o@)^sets}"
fi
@@ -151,7 +151,7 @@ _gentoo_packages_update_available_sets() {
setsfiles=(${setspath}/*~*.conf(N))
for set in ${setsfiles[@]}; do
sets+=(${set}(:t))
- done;
+ done
sets+=($(_parsesetsconf ${PORTDIR} sets))
fi
fi
@@ -253,7 +253,7 @@ _gentoo_packages_update_available_versions(){
local var overlay_ebuilds portage_ebuilds expl trees category
PORTDIR=$(_portdir)
- PORTDIR_OVERLAY=$(_portdir -o);
+ PORTDIR_OVERLAY=$(_portdir -o)
trees=($PORTDIR $=PORTDIR_OVERLAY)
category=($trees/*-*(/:t))