| 1 |
commit: 1dc4fb5541cb73c1f203290a69d0d1150a01d285 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 1 07:31:53 2014 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 1 07:33:42 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/zsh-completion.git;a=commit;h=1dc4fb55 |
| 7 |
|
| 8 |
_gentoo_packages: remove unnecessary semicolons |
| 9 |
|
| 10 |
We should try to remain consistent in stylistic coding patterns. |
| 11 |
|
| 12 |
--- |
| 13 |
src/_gentoo_packages | 50 +++++++++++++++++++++++++------------------------- |
| 14 |
1 file changed, 25 insertions(+), 25 deletions(-) |
| 15 |
|
| 16 |
diff --git a/src/_gentoo_packages b/src/_gentoo_packages |
| 17 |
index 9a747b7..a8a3aff 100644 |
| 18 |
--- a/src/_gentoo_packages |
| 19 |
+++ b/src/_gentoo_packages |
| 20 |
@@ -42,25 +42,25 @@ _portdir() { |
| 21 |
} |
| 22 |
|
| 23 |
_parsereposconf() { |
| 24 |
- local v f insection section arr; |
| 25 |
+ local v f insection section arr |
| 26 |
|
| 27 |
for f in /usr/share/portage/config/repos.conf \ |
| 28 |
/etc/portage/repos.conf \ |
| 29 |
/etc/portage/repos.conf/*.conf; do |
| 30 |
|
| 31 |
[[ -f ${f} ]] || continue |
| 32 |
- insection=0; |
| 33 |
- declare -A arr; |
| 34 |
- IFS='= '; |
| 35 |
+ insection=0 |
| 36 |
+ declare -A arr |
| 37 |
+ IFS='= ' |
| 38 |
|
| 39 |
while read -r name value; do |
| 40 |
[[ -z ${name} || ${name} == '#'* ]] && continue |
| 41 |
|
| 42 |
if [[ (${name} == '['*']') && (-z ${value}) ]]; then |
| 43 |
- value=${name//(\]|\[)}; |
| 44 |
- name="section"; |
| 45 |
- fi; |
| 46 |
- arr[${name}]=${value}; |
| 47 |
+ value=${name//(\]|\[)} |
| 48 |
+ name="section" |
| 49 |
+ fi |
| 50 |
+ arr[${name}]=${value} |
| 51 |
|
| 52 |
if [[ ${insection} == 1 && ${name} == "section" ]]; then |
| 53 |
break |
| 54 |
@@ -69,7 +69,7 @@ _parsereposconf() { |
| 55 |
secname+=(${value}) |
| 56 |
elif [[ ${insection} == 1 ]]; then |
| 57 |
if [[ ${name} == ${2} ]]; then |
| 58 |
- v=${value}; |
| 59 |
+ v=${value} |
| 60 |
fi |
| 61 |
fi |
| 62 |
continue |
| 63 |
@@ -86,10 +86,10 @@ _parsereposconf() { |
| 64 |
_parsesetsconf() { |
| 65 |
[[ -d ${1} ]] || continue |
| 66 |
|
| 67 |
- local v f places sections setsconf insection section arr; |
| 68 |
+ local v f places sections setsconf insection section arr |
| 69 |
|
| 70 |
if [[ -d ${1}/sets ]]; then |
| 71 |
- setsconf=(${1}/sets/*.conf(N)); |
| 72 |
+ setsconf=(${1}/sets/*.conf(N)) |
| 73 |
[[ (($#setsconf > 0)) ]] && places=(${setsconf}) |
| 74 |
elif [[ -f ${1}/sets.conf ]]; then |
| 75 |
places=(${1}/sets.conf) |
| 76 |
@@ -97,28 +97,28 @@ _parsesetsconf() { |
| 77 |
|
| 78 |
for f in ${(@)places}; do |
| 79 |
if [[ -r ${f} ]]; then |
| 80 |
- insection=0; |
| 81 |
- declare -A arr; |
| 82 |
- IFS='= '; |
| 83 |
+ insection=0 |
| 84 |
+ declare -A arr |
| 85 |
+ IFS='= ' |
| 86 |
while read -r name value; do |
| 87 |
[[ -z ${name} || ${name} == '#'* ]] && continue |
| 88 |
|
| 89 |
if [[ (${name} == '['*']') && (-z ${value}) ]]; then |
| 90 |
- value=${name//(\]|\[)}; |
| 91 |
- name="section"; |
| 92 |
- fi; |
| 93 |
- arr[${name}]=${value}; |
| 94 |
+ value=${name//(\]|\[)} |
| 95 |
+ name="section" |
| 96 |
+ fi |
| 97 |
+ arr[${name}]=${value} |
| 98 |
|
| 99 |
if [[ ${insection} == 1 && ${name} == "section" ]]; then |
| 100 |
[[ "sets" == ${2} ]] && [[ ! ${value} =~ "sets" ]] && sections+=(${value}) |
| 101 |
- insection=0; |
| 102 |
+ insection=0 |
| 103 |
elif [[ ${name} == "section" ]]; then |
| 104 |
[[ ${value} =~ "${1:t} sets" ]] && insection=1 |
| 105 |
[[ "sets" == ${2} ]] && [[ ! ${value} =~ "sets" ]] && sections+=(${value}) |
| 106 |
elif [[ ${insection} == 1 ]]; then |
| 107 |
[[ "sets" == ${2} ]] && continue |
| 108 |
if [[ ${name} == "directory" ]]; then |
| 109 |
- v=${value}; |
| 110 |
+ v=${value} |
| 111 |
fi |
| 112 |
fi |
| 113 |
continue |
| 114 |
@@ -129,13 +129,13 @@ _parsesetsconf() { |
| 115 |
if [[ "sets" == ${2} ]]; then |
| 116 |
[[ ((${#sections} > 0)) ]] && echo ${(@)sections} |
| 117 |
else |
| 118 |
- [[ ((${#v} > 0)) ]] && echo ${v:t}; |
| 119 |
+ [[ ((${#v} > 0)) ]] && echo ${v:t} |
| 120 |
fi |
| 121 |
} |
| 122 |
|
| 123 |
_gentoo_packages_update_installed_sets() { |
| 124 |
- local sets; |
| 125 |
- sets=($(</var/lib/portage/world_sets)); |
| 126 |
+ local sets |
| 127 |
+ sets=($(</var/lib/portage/world_sets)) |
| 128 |
if [[ ((${#sets} > 0)) ]]; then |
| 129 |
_wanted installed_sets expl 'installed set' compadd "$@" "${(o@)^sets}" |
| 130 |
fi |
| 131 |
@@ -151,7 +151,7 @@ _gentoo_packages_update_available_sets() { |
| 132 |
setsfiles=(${setspath}/*~*.conf(N)) |
| 133 |
for set in ${setsfiles[@]}; do |
| 134 |
sets+=(${set}(:t)) |
| 135 |
- done; |
| 136 |
+ done |
| 137 |
sets+=($(_parsesetsconf ${PORTDIR} sets)) |
| 138 |
fi |
| 139 |
fi |
| 140 |
@@ -253,7 +253,7 @@ _gentoo_packages_update_available_versions(){ |
| 141 |
local var overlay_ebuilds portage_ebuilds expl trees category |
| 142 |
|
| 143 |
PORTDIR=$(_portdir) |
| 144 |
- PORTDIR_OVERLAY=$(_portdir -o); |
| 145 |
+ PORTDIR_OVERLAY=$(_portdir -o) |
| 146 |
|
| 147 |
trees=($PORTDIR $=PORTDIR_OVERLAY) |
| 148 |
category=($trees/*-*(/:t)) |
Archives