1 |
now that eutils.eclass contains a common version of safely handling shopts |
2 |
settings, we can drop the local versionator.eclass code that was handling this |
3 |
and convert it to eutils. seems to work for me, but i rarely use this eclass. |
4 |
-mike |
5 |
|
6 |
--- versionator.eclass 18 Jul 2010 21:24:33 -0000 1.16 |
7 |
+++ versionator.eclass 18 Jul 2010 21:29:21 -0000 |
8 |
@@ -25,27 +25,7 @@ |
9 |
# version_is_at_least want have |
10 |
# which may be buggy, so use with caution. |
11 |
|
12 |
-# Quick function to toggle the shopts required for some functions on and off |
13 |
-# Used because we can't set extglob in global scope anymore (QA Violation) |
14 |
-__versionator_shopt_toggle() { |
15 |
- VERSIONATOR_RECURSION=${VERSIONATOR_RECURSION:-0} |
16 |
- case "$1" in |
17 |
- "on") |
18 |
- if [[ $VERSIONATOR_RECURSION -lt 1 ]] ; then |
19 |
- VERSIONATOR_OLD_EXTGLOB=$(shopt -p extglob) |
20 |
- shopt -s extglob |
21 |
- fi |
22 |
- VERSIONATOR_RECURSION=$(( $VERSIONATOR_RECURSION + 1 )) |
23 |
- ;; |
24 |
- "off") |
25 |
- VERSIONATOR_RECURSION=$(( $VERSIONATOR_RECURSION - 1 )) |
26 |
- if [[ $VERSIONATOR_RECURSION -lt 1 ]] ; then |
27 |
- eval $VERSIONATOR_OLD_EXTGLOB |
28 |
- fi |
29 |
- ;; |
30 |
- esac |
31 |
- return 0 |
32 |
-} |
33 |
+inherit eutils |
34 |
|
35 |
# @FUNCTION: get_all_version_components |
36 |
# @USAGE: [version] |
37 |
@@ -58,7 +38,7 @@ __versionator_shopt_toggle() { |
38 |
# 20040905 -> 20040905 |
39 |
# 3.0c-r1 -> 3 . 0 c - r1 |
40 |
get_all_version_components() { |
41 |
- __versionator_shopt_toggle on |
42 |
+ eshopts_push -s extglob |
43 |
local ver_str=${1:-${PV}} result result_idx=0 |
44 |
result=( ) |
45 |
|
46 |
@@ -66,7 +46,7 @@ get_all_version_components() { |
47 |
# times. |
48 |
if [[ "${VERSIONATOR_CACHE_VER_STR}" == "${ver_str}" ]] ; then |
49 |
echo ${VERSIONATOR_CACHE_RESULT} |
50 |
- __versionator_shopt_toggle off |
51 |
+ eshopts_pop |
52 |
return |
53 |
fi |
54 |
export VERSIONATOR_CACHE_VER_STR="${ver_str}" |
55 |
@@ -106,7 +86,7 @@ get_all_version_components() { |
56 |
|
57 |
export VERSIONATOR_CACHE_RESULT="${result[@]}" |
58 |
echo ${result[@]} |
59 |
- __versionator_shopt_toggle off |
60 |
+ eshopts_pop |
61 |
} |
62 |
|
63 |
# @FUNCTION: get_version_components |
64 |
@@ -120,11 +100,11 @@ get_all_version_components() { |
65 |
# 20040905 -> 20040905 |
66 |
# 3.0c-r1 -> 3 0 c r1 |
67 |
get_version_components() { |
68 |
- __versionator_shopt_toggle on |
69 |
+ eshopts_push -s extglob |
70 |
local c="$(get_all_version_components "${1:-${PV}}")" |
71 |
c=( ${c[@]//[-._]/ } ) |
72 |
echo ${c[@]} |
73 |
- __versionator_shopt_toggle off |
74 |
+ eshopts_pop |
75 |
} |
76 |
|
77 |
# @FUNCTION: get_major_version |
78 |
@@ -137,11 +117,11 @@ get_version_components() { |
79 |
# 20040905 -> 20040905 |
80 |
# 3.0c-r1 -> 3 |
81 |
get_major_version() { |
82 |
- __versionator_shopt_toggle on |
83 |
+ eshopts_push -s extglob |
84 |
local c |
85 |
c=( $(get_all_version_components "${1:-${PV}}" ) ) |
86 |
echo ${c[0]} |
87 |
- __versionator_shopt_toggle off |
88 |
+ eshopts_pop |
89 |
} |
90 |
|
91 |
# @FUNCTION: get_version_component_range |
92 |
@@ -153,7 +133,7 @@ get_major_version() { |
93 |
# 1-2 1.2.3 -> 1.2 |
94 |
# 2- 1.2.3 -> 2.3 |
95 |
get_version_component_range() { |
96 |
- __versionator_shopt_toggle on |
97 |
+ eshopts_push -s extglob |
98 |
local c v="${2:-${PV}}" range="${1}" range_start range_end i=-1 j=0 |
99 |
c=( $(get_all_version_components ${v} ) ) |
100 |
range_start="${range%-*}" ; range_start="${range_start:-1}" |
101 |
@@ -161,17 +141,17 @@ get_version_component_range() { |
102 |
|
103 |
while (( j < ${range_start} )) ; do |
104 |
i=$(($i + 1)) |
105 |
- [[ $i -gt ${#c[@]} ]] && __versionator_shopt_toggle off && return |
106 |
+ [[ $i -gt ${#c[@]} ]] && eshopts_pop && return |
107 |
[[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1)) |
108 |
done |
109 |
|
110 |
while (( j <= ${range_end} )) ; do |
111 |
echo -n ${c[$i]} |
112 |
- [[ $i -gt ${#c[@]} ]] && __versionator_shopt_toggle off && return |
113 |
+ [[ $i -gt ${#c[@]} ]] && eshopts_pop && return |
114 |
[[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1)) |
115 |
i=$(($i + 1)) |
116 |
done |
117 |
- __versionator_shopt_toggle off |
118 |
+ eshopts_pop |
119 |
} |
120 |
|
121 |
# @FUNCTION: get_after_major_version |
122 |
@@ -185,9 +165,9 @@ get_version_component_range() { |
123 |
# 20040905 -> (empty string) |
124 |
# 3.0c-r1 -> 0c-r1 |
125 |
get_after_major_version() { |
126 |
- __versionator_shopt_toggle on |
127 |
+ eshopts_push -s extglob |
128 |
echo $(get_version_component_range 2- "${1:-${PV}}" ) |
129 |
- __versionator_shopt_toggle off |
130 |
+ eshopts_pop |
131 |
} |
132 |
|
133 |
# @FUNCTION: replace_version_separator |
134 |
@@ -201,7 +181,7 @@ get_after_major_version() { |
135 |
# Rather than being a number, $1 can be a separator character such as '-', '.' |
136 |
# or '_'. In this case, the first separator of this kind is selected. |
137 |
replace_version_separator() { |
138 |
- __versionator_shopt_toggle on |
139 |
+ eshopts_push -s extglob |
140 |
local w i c found=0 v="${3:-${PV}}" |
141 |
w=${1:-1} |
142 |
c=( $(get_all_version_components ${v} ) ) |
143 |
@@ -226,7 +206,7 @@ replace_version_separator() { |
144 |
fi |
145 |
c=${c[@]} |
146 |
echo ${c// } |
147 |
- __versionator_shopt_toggle off |
148 |
+ eshopts_pop |
149 |
} |
150 |
|
151 |
# @FUNCTION: replace_all_version_separators |
152 |
@@ -235,12 +215,12 @@ replace_version_separator() { |
153 |
# Replace all version separators in $2 (defaults to $PV) with $1. |
154 |
# '_' 1b.2.3 -> 1b_2_3 |
155 |
replace_all_version_separators() { |
156 |
- __versionator_shopt_toggle on |
157 |
+ eshopts_push -s extglob |
158 |
local c |
159 |
c=( $(get_all_version_components "${2:-${PV}}" ) ) |
160 |
c="${c[@]//[-._]/$1}" |
161 |
echo ${c// } |
162 |
- __versionator_shopt_toggle off |
163 |
+ eshopts_pop |
164 |
} |
165 |
|
166 |
# @FUNCTION: delete_version_separator |
167 |
@@ -254,9 +234,9 @@ replace_all_version_separators() { |
168 |
# Rather than being a number, $1 can be a separator character such as '-', '.' |
169 |
# or '_'. In this case, the first separator of this kind is deleted. |
170 |
delete_version_separator() { |
171 |
- __versionator_shopt_toggle on |
172 |
+ eshopts_push -s extglob |
173 |
replace_version_separator "${1}" "" "${2}" |
174 |
- __versionator_shopt_toggle off |
175 |
+ eshopts_pop |
176 |
} |
177 |
|
178 |
# @FUNCTION: delete_all_version_separators |
179 |
@@ -265,9 +245,9 @@ delete_version_separator() { |
180 |
# Delete all version separators in $1 (defaults to $PV). |
181 |
# 1b.2.3 -> 1b23 |
182 |
delete_all_version_separators() { |
183 |
- __versionator_shopt_toggle on |
184 |
+ eshopts_push -s extglob |
185 |
replace_all_version_separators "" "${1}" |
186 |
- __versionator_shopt_toggle off |
187 |
+ eshopts_pop |
188 |
} |
189 |
|
190 |
# @FUNCTION: get_version_component_count |
191 |
@@ -277,11 +257,11 @@ delete_all_version_separators() { |
192 |
# 1.0.1 -> 3 |
193 |
# 3.0c-r1 -> 4 |
194 |
get_version_component_count() { |
195 |
- __versionator_shopt_toggle on |
196 |
+ eshopts_push -s extglob |
197 |
local a |
198 |
a=( $(get_version_components "${1:-${PV}}" ) ) |
199 |
echo ${#a[@]} |
200 |
- __versionator_shopt_toggle off |
201 |
+ eshopts_pop |
202 |
} |
203 |
|
204 |
# @FUNCTION: get_last_version_component_index |
205 |
@@ -292,9 +272,9 @@ get_version_component_count() { |
206 |
# 1.0.1 -> 3 |
207 |
# 3.0c-r1 -> 4 |
208 |
get_last_version_component_index() { |
209 |
- __versionator_shopt_toggle on |
210 |
+ eshopts_push -s extglob |
211 |
echo $(( $(get_version_component_count "${1:-${PV}}" ) - 1 )) |
212 |
- __versionator_shopt_toggle off |
213 |
+ eshopts_pop |
214 |
} |
215 |
|
216 |
# @FUNCTION: version_is_at_least |
217 |
@@ -304,25 +284,25 @@ get_last_version_component_index() { |
218 |
# only. May not be reliable, be sure to do very careful testing before actually |
219 |
# using this. |
220 |
version_is_at_least() { |
221 |
- __versionator_shopt_toggle on |
222 |
+ eshopts_push -s extglob |
223 |
local want_s="$1" have_s="${2:-${PVR}}" r |
224 |
version_compare "${want_s}" "${have_s}" |
225 |
r=$? |
226 |
case $r in |
227 |
1|2) |
228 |
- __versionator_shopt_toggle off |
229 |
+ eshopts_pop |
230 |
return 0 |
231 |
;; |
232 |
3) |
233 |
- __versionator_shopt_toggle off |
234 |
+ eshopts_pop |
235 |
return 1 |
236 |
;; |
237 |
*) |
238 |
- __versionator_shopt_toggle off |
239 |
+ eshopts_pop |
240 |
die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]" |
241 |
;; |
242 |
esac |
243 |
- __versionator_shopt_toggle off |
244 |
+ eshopts_pop |
245 |
} |
246 |
|
247 |
# @FUNCTION: version_compare |
248 |
@@ -333,7 +313,7 @@ version_is_at_least() { |
249 |
# return 3. You probably want version_is_at_least rather than this function. |
250 |
# May not be very reliable. Test carefully before using this. |
251 |
version_compare() { |
252 |
- __versionator_shopt_toggle on |
253 |
+ eshopts_push -s extglob |
254 |
local ver_a=${1} ver_b=${2} parts_a parts_b cur_idx_a=0 cur_idx_b=0 |
255 |
parts_a=( $(get_all_version_components "${ver_a}" ) ) |
256 |
parts_b=( $(get_all_version_components "${ver_b}" ) ) |
257 |
@@ -379,8 +359,8 @@ version_compare() { |
258 |
[[ -z ${cur_tok_b} ]] && cur_tok_b=0 |
259 |
|
260 |
# compare |
261 |
- [[ ${cur_tok_a} -lt ${cur_tok_b} ]] && __versionator_shopt_toggle off && return 1 |
262 |
- [[ ${cur_tok_a} -gt ${cur_tok_b} ]] && __versionator_shopt_toggle off && return 3 |
263 |
+ [[ ${cur_tok_a} -lt ${cur_tok_b} ]] && eshopts_pop && return 1 |
264 |
+ [[ ${cur_tok_a} -gt ${cur_tok_b} ]] && eshopts_pop && return 3 |
265 |
done |
266 |
|
267 |
### number parts equal. compare letter parts. |
268 |
@@ -401,8 +381,8 @@ version_compare() { |
269 |
fi |
270 |
|
271 |
# compare |
272 |
- [[ ${letter_a} < ${letter_b} ]] && __versionator_shopt_toggle off && return 1 |
273 |
- [[ ${letter_a} > ${letter_b} ]] && __versionator_shopt_toggle off && return 3 |
274 |
+ [[ ${letter_a} < ${letter_b} ]] && eshopts_pop && return 1 |
275 |
+ [[ ${letter_a} > ${letter_b} ]] && eshopts_pop && return 3 |
276 |
|
277 |
### letter parts equal. compare suffixes in order. |
278 |
local suffix rule part r_lt r_gt |
279 |
@@ -427,19 +407,19 @@ version_compare() { |
280 |
|
281 |
[[ -z ${suffix_a} ]] && [[ -z ${suffix_b} ]] && continue |
282 |
|
283 |
- [[ -z ${suffix_a} ]] && __versionator_shopt_toggle off && return ${r_gt} |
284 |
- [[ -z ${suffix_b} ]] && __versionator_shopt_toggle off && return ${r_lt} |
285 |
+ [[ -z ${suffix_a} ]] && eshopts_pop && return ${r_gt} |
286 |
+ [[ -z ${suffix_b} ]] && eshopts_pop && return ${r_lt} |
287 |
|
288 |
# avoid octal problems |
289 |
suffix_a=${suffix_a##+(0)} ; suffix_a=${suffix_a:-0} |
290 |
suffix_b=${suffix_b##+(0)} ; suffix_b=${suffix_b:-0} |
291 |
|
292 |
- [[ ${suffix_a} -lt ${suffix_b} ]] && __versionator_shopt_toggle off && return 1 |
293 |
- [[ ${suffix_a} -gt ${suffix_b} ]] && __versionator_shopt_toggle off && return 3 |
294 |
+ [[ ${suffix_a} -lt ${suffix_b} ]] && eshopts_pop && return 1 |
295 |
+ [[ ${suffix_a} -gt ${suffix_b} ]] && eshopts_pop && return 3 |
296 |
done |
297 |
|
298 |
### no differences. |
299 |
- __versionator_shopt_toggle off |
300 |
+ eshopts_pop |
301 |
return 2 |
302 |
} |
303 |
|
304 |
@@ -450,7 +430,7 @@ version_compare() { |
305 |
# algorithm for simplicity, so don't call it with more than a few dozen items. |
306 |
# Uses version_compare, so be careful. |
307 |
version_sort() { |
308 |
- __versionator_shopt_toggle on |
309 |
+ eshopts_push -s extglob |
310 |
local items= left=0 |
311 |
items=( $@ ) |
312 |
while [[ ${left} -lt ${#items[@]} ]] ; do |
313 |
@@ -467,7 +447,7 @@ version_sort() { |
314 |
left=$(( ${left} + 1 )) |
315 |
done |
316 |
echo ${items[@]} |
317 |
- __versionator_shopt_toggle off |
318 |
+ eshopts_pop |
319 |
} |
320 |
|
321 |
# @FUNCTION: version_format_string |
322 |
@@ -489,7 +469,7 @@ version_format_string() { |
323 |
} |
324 |
|
325 |
__versionator__test_version_compare() { |
326 |
- __versionator_shopt_toggle on |
327 |
+ eshopts_push -s extglob |
328 |
local lt=1 eq=2 gt=3 p q |
329 |
|
330 |
__versionator__test_version_compare_t() { |
331 |
@@ -593,5 +573,5 @@ __versionator__test_version_compare() { |
332 |
__versionator__test_version_compare_t "7.2${p}3" $gt "7.2${p}2" |
333 |
__versionator__test_version_compare_t "7.2${p}2" $lt "7.2${p}3" |
334 |
done |
335 |
- __versionator_shopt_toggle off |
336 |
+ eshopts_pop |
337 |
} |