/[gentoo-x86]/eclass/versionator.eclass
Gentoo

Diff of /eclass/versionator.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.17 Revision 1.20
1# Copyright 1999-2008 Gentoo Foundation 1# Copyright 1999-2008 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.17 2010/07/19 20:17:35 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.20 2011/11/22 18:42:10 vapier Exp $
4 4
5# @ECLASS: versionator.eclass 5# @ECLASS: versionator.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Jonathan Callen <abcd@gentoo.org>
7# base-system@gentoo.org 8# base-system@gentoo.org
8# @BLURB: functions which simplify manipulation of ${PV} and similar version strings 9# @BLURB: functions which simplify manipulation of ${PV} and similar version strings
9# @DESCRIPTION: 10# @DESCRIPTION:
10# This eclass provides functions which simplify manipulating $PV and similar 11# This eclass provides functions which simplify manipulating $PV and similar
11# variables. Most functions default to working with $PV, although other 12# variables. Most functions default to working with $PV, although other
37# 3.0_p2 -> 3 . 0 _ p2 38# 3.0_p2 -> 3 . 0 _ p2
38# 20040905 -> 20040905 39# 20040905 -> 20040905
39# 3.0c-r1 -> 3 . 0 c - r1 40# 3.0c-r1 -> 3 . 0 c - r1
40get_all_version_components() { 41get_all_version_components() {
41 eshopts_push -s extglob 42 eshopts_push -s extglob
42 local ver_str=${1:-${PV}} result result_idx=0 43 local ver_str=${1:-${PV}} result
43 result=( ) 44 result=()
44 45
45 # sneaky cache trick cache to avoid having to parse the same thing several 46 # sneaky cache trick cache to avoid having to parse the same thing several
46 # times. 47 # times.
47 if [[ "${VERSIONATOR_CACHE_VER_STR}" == "${ver_str}" ]] ; then 48 if [[ ${VERSIONATOR_CACHE_VER_STR} == ${ver_str} ]] ; then
48 echo ${VERSIONATOR_CACHE_RESULT} 49 echo ${VERSIONATOR_CACHE_RESULT}
49 eshopts_pop 50 eshopts_pop
50 return 51 return
51 fi 52 fi
52 export VERSIONATOR_CACHE_VER_STR="${ver_str}" 53 export VERSIONATOR_CACHE_VER_STR=${ver_str}
53 54
54 while [[ -n "$ver_str" ]] ; do 55 while [[ -n $ver_str ]] ; do
55 case "${ver_str:0:1}" in 56 case "${ver_str::1}" in
56 # number: parse whilst we have a number 57 # number: parse whilst we have a number
57 [[:digit:]]) 58 [[:digit:]])
58 result[$result_idx]="${ver_str%%[^[:digit:]]*}" 59 result+=("${ver_str%%[^[:digit:]]*}")
59 ver_str="${ver_str##+([[:digit:]])}" 60 ver_str=${ver_str##+([[:digit:]])}
60 result_idx=$(($result_idx + 1))
61 ;; 61 ;;
62 62
63 # separator: single character 63 # separator: single character
64 [-_.]) 64 [-_.])
65 result[$result_idx]="${ver_str:0:1}" 65 result+=("${ver_str::1}")
66 ver_str="${ver_str:1}" 66 ver_str=${ver_str:1}
67 result_idx=$(($result_idx + 1))
68 ;; 67 ;;
69 68
70 # letter: grab the letters plus any following numbers 69 # letter: grab the letters plus any following numbers
71 [[:alpha:]]) 70 [[:alpha:]])
72 local not_match="${ver_str##+([[:alpha:]])*([[:digit:]])}" 71 local not_match=${ver_str##+([[:alpha:]])*([[:digit:]])}
72 # Can't say "${ver_str::-${#not_match}}" in Bash 3.2
73 result[$result_idx]=${ver_str:0:$((${#ver_str} - ${#not_match}))} 73 result+=("${ver_str::${#ver_str} - ${#not_match}}")
74 ver_str="${not_match}" 74 ver_str=${not_match}
75 result_idx=$(($result_idx + 1))
76 ;; 75 ;;
77 76
78 # huh? 77 # huh?
79 *) 78 *)
80 result[$result_idx]="${ver_str:0:1}" 79 result+=("${ver_str::1}")
81 ver_str="${ver_str:1}" 80 ver_str=${ver_str:1}
82 result_idx=$(($result_idx + 1))
83 ;; 81 ;;
84 esac 82 esac
85 done 83 done
86 84
87 export VERSIONATOR_CACHE_RESULT="${result[@]}" 85 export VERSIONATOR_CACHE_RESULT=${result[*]}
88 echo ${result[@]} 86 echo ${result[@]}
89 eshopts_pop 87 eshopts_pop
90} 88}
91 89
92# @FUNCTION: get_version_components 90# @FUNCTION: get_version_components
98# 7c -> 7 c 96# 7c -> 7 c
99# 3.0_p2 -> 3 0 p2 97# 3.0_p2 -> 3 0 p2
100# 20040905 -> 20040905 98# 20040905 -> 20040905
101# 3.0c-r1 -> 3 0 c r1 99# 3.0c-r1 -> 3 0 c r1
102get_version_components() { 100get_version_components() {
103 eshopts_push -s extglob
104 local c="$(get_all_version_components "${1:-${PV}}")" 101 local c=$(get_all_version_components "${1:-${PV}}")
105 c=( ${c[@]//[-._]/ } ) 102 echo ${c//[-._]/ }
106 echo ${c[@]}
107 eshopts_pop
108} 103}
109 104
110# @FUNCTION: get_major_version 105# @FUNCTION: get_major_version
111# @USAGE: [version] 106# @USAGE: [version]
112# @DESCRIPTION: 107# @DESCRIPTION:
115# 7c -> 7 110# 7c -> 7
116# 3.0_p2 -> 3 111# 3.0_p2 -> 3
117# 20040905 -> 20040905 112# 20040905 -> 20040905
118# 3.0c-r1 -> 3 113# 3.0c-r1 -> 3
119get_major_version() { 114get_major_version() {
120 eshopts_push -s extglob
121 local c
122 c=( $(get_all_version_components "${1:-${PV}}" ) ) 115 local c=($(get_all_version_components "${1:-${PV}}"))
123 echo ${c[0]} 116 echo ${c[0]}
124 eshopts_pop
125} 117}
126 118
127# @FUNCTION: get_version_component_range 119# @FUNCTION: get_version_component_range
128# @USAGE: [version] 120# @USAGE: <range> [version]
129# @DESCRIPTION: 121# @DESCRIPTION:
130# Get a particular component or range of components from the version. If no 122# Get a particular component or range of components from the version. If no
131# version parameter is supplied, defaults to $PV. 123# version parameter is supplied, defaults to $PV.
132# 1 1.2.3 -> 1 124# 1 1.2.3 -> 1
133# 1-2 1.2.3 -> 1.2 125# 1-2 1.2.3 -> 1.2
134# 2- 1.2.3 -> 2.3 126# 2- 1.2.3 -> 2.3
135get_version_component_range() { 127get_version_component_range() {
136 eshopts_push -s extglob 128 eshopts_push -s extglob
137 local c v="${2:-${PV}}" range="${1}" range_start range_end i=-1 j=0 129 local c v="${2:-${PV}}" range="${1}" range_start range_end
130 local -i i=-1 j=0
138 c=( $(get_all_version_components ${v} ) ) 131 c=($(get_all_version_components "${v}"))
139 range_start="${range%-*}" ; range_start="${range_start:-1}" 132 range_start=${range%-*}; range_start=${range_start:-1}
140 range_end="${range#*-}" ; range_end="${range_end:-${#c[@]}}" 133 range_end=${range#*-} ; range_end=${range_end:-${#c[@]}}
141 134
142 while (( j < ${range_start} )) ; do 135 while ((j < range_start)); do
143 i=$(($i + 1)) 136 i+=1
144 [[ $i -gt ${#c[@]} ]] && eshopts_pop && return 137 ((i > ${#c[@]})) && eshopts_pop && return
145 [[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1)) 138 [[ -n "${c[i]//[-._]}" ]] && j+=1
146 done 139 done
147 140
148 while (( j <= ${range_end} )) ; do 141 while ((j <= range_end)); do
149 echo -n ${c[$i]} 142 echo -n ${c[i]}
150 [[ $i -gt ${#c[@]} ]] && eshopts_pop && return 143 ((i > ${#c[@]})) && eshopts_pop && return
151 [[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1)) 144 [[ -n "${c[i]//[-._]}" ]] && j+=1
152 i=$(($i + 1)) 145 i+=1
153 done 146 done
154 eshopts_pop 147 eshopts_pop
155} 148}
156 149
157# @FUNCTION: get_after_major_version 150# @FUNCTION: get_after_major_version
163# 7c -> c 156# 7c -> c
164# 3.0_p2 -> 0_p2 157# 3.0_p2 -> 0_p2
165# 20040905 -> (empty string) 158# 20040905 -> (empty string)
166# 3.0c-r1 -> 0c-r1 159# 3.0c-r1 -> 0c-r1
167get_after_major_version() { 160get_after_major_version() {
168 eshopts_push -s extglob
169 echo $(get_version_component_range 2- "${1:-${PV}}" ) 161 echo $(get_version_component_range 2- "${1:-${PV}}")
170 eshopts_pop
171} 162}
172 163
173# @FUNCTION: replace_version_separator 164# @FUNCTION: replace_version_separator
174# @USAGE: <search> <replacement> [subject] 165# @USAGE: <search> <replacement> [subject]
175# @DESCRIPTION: 166# @DESCRIPTION:
180# 1 '_' 1b-2.3 -> 1b_2.3 171# 1 '_' 1b-2.3 -> 1b_2.3
181# Rather than being a number, $1 can be a separator character such as '-', '.' 172# Rather than being a number, $1 can be a separator character such as '-', '.'
182# or '_'. In this case, the first separator of this kind is selected. 173# or '_'. In this case, the first separator of this kind is selected.
183replace_version_separator() { 174replace_version_separator() {
184 eshopts_push -s extglob 175 eshopts_push -s extglob
185 local w i c found=0 v="${3:-${PV}}" 176 local w c v="${3:-${PV}}"
177 declare -i i found=0
186 w=${1:-1} 178 w=${1:-1}
187 c=( $(get_all_version_components ${v} ) ) 179 c=($(get_all_version_components ${v}))
188 if [[ "${w//[[:digit:]]/}" == "${w}" ]] ; then 180 if [[ ${w} != *[[:digit:]]* ]] ; then
189 # it's a character, not an index 181 # it's a character, not an index
190 for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do 182 for ((i = 0; i < ${#c[@]}; i++)); do
191 if [[ "${c[${i}]}" == "${w}" ]] ; then 183 if [[ ${c[i]} == ${w} ]]; then
192 c[${i}]="${2}" 184 c[i]=${2}
193 break 185 break
194 fi 186 fi
195 done 187 done
196 else 188 else
197 for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do 189 for ((i = 0; i < ${#c[@]}; i++)); do
198 if [[ -n "${c[${i}]//[^-._]}" ]] ; then 190 if [[ -n "${c[i]//[^-._]}" ]]; then
199 found=$(($found + 1)) 191 found+=1
200 if [[ "$found" == "${w}" ]] ; then 192 if ((found == w)); then
201 c[${i}]="${2}" 193 c[i]=${2}
202 break 194 break
203 fi 195 fi
204 fi 196 fi
205 done 197 done
206 fi 198 fi
207 c=${c[@]} 199 c=${c[*]}
208 echo ${c// } 200 echo ${c// }
209 eshopts_pop 201 eshopts_pop
210} 202}
211 203
212# @FUNCTION: replace_all_version_separators 204# @FUNCTION: replace_all_version_separators
213# @USAGE: <replacement> [subject] 205# @USAGE: <replacement> [subject]
214# @DESCRIPTION: 206# @DESCRIPTION:
215# Replace all version separators in $2 (defaults to $PV) with $1. 207# Replace all version separators in $2 (defaults to $PV) with $1.
216# '_' 1b.2.3 -> 1b_2_3 208# '_' 1b.2.3 -> 1b_2_3
217replace_all_version_separators() { 209replace_all_version_separators() {
218 eshopts_push -s extglob
219 local c
220 c=( $(get_all_version_components "${2:-${PV}}" ) ) 210 local c=($(get_all_version_components "${2:-${PV}}"))
221 c="${c[@]//[-._]/$1}" 211 c=${c[@]//[-._]/$1}
222 echo ${c// } 212 echo ${c// }
223 eshopts_pop
224} 213}
225 214
226# @FUNCTION: delete_version_separator 215# @FUNCTION: delete_version_separator
227# @USAGE: <search> [subject] 216# @USAGE: <search> [subject]
228# @DESCRIPTION: 217# @DESCRIPTION:
232# 2 1.2.3 -> 1.23 221# 2 1.2.3 -> 1.23
233# 1 1b-2.3 -> 1b2.3 222# 1 1b-2.3 -> 1b2.3
234# Rather than being a number, $1 can be a separator character such as '-', '.' 223# Rather than being a number, $1 can be a separator character such as '-', '.'
235# or '_'. In this case, the first separator of this kind is deleted. 224# or '_'. In this case, the first separator of this kind is deleted.
236delete_version_separator() { 225delete_version_separator() {
237 eshopts_push -s extglob
238 replace_version_separator "${1}" "" "${2}" 226 replace_version_separator "${1}" "" "${2}"
239 eshopts_pop
240} 227}
241 228
242# @FUNCTION: delete_all_version_separators 229# @FUNCTION: delete_all_version_separators
243# @USAGE: [subject] 230# @USAGE: [subject]
244# @DESCRIPTION: 231# @DESCRIPTION:
245# Delete all version separators in $1 (defaults to $PV). 232# Delete all version separators in $1 (defaults to $PV).
246# 1b.2.3 -> 1b23 233# 1b.2.3 -> 1b23
247delete_all_version_separators() { 234delete_all_version_separators() {
248 eshopts_push -s extglob
249 replace_all_version_separators "" "${1}" 235 replace_all_version_separators "" "${1}"
250 eshopts_pop
251} 236}
252 237
253# @FUNCTION: get_version_component_count 238# @FUNCTION: get_version_component_count
254# @USAGE: [version] 239# @USAGE: [version]
255# @DESCRIPTION: 240# @DESCRIPTION:
256# How many version components are there in $1 (defaults to $PV)? 241# How many version components are there in $1 (defaults to $PV)?
257# 1.0.1 -> 3 242# 1.0.1 -> 3
258# 3.0c-r1 -> 4 243# 3.0c-r1 -> 4
259get_version_component_count() { 244get_version_component_count() {
260 eshopts_push -s extglob
261 local a
262 a=( $(get_version_components "${1:-${PV}}" ) ) 245 local a=($(get_version_components "${1:-${PV}}"))
263 echo ${#a[@]} 246 echo ${#a[@]}
264 eshopts_pop
265} 247}
266 248
267# @FUNCTION: get_last_version_component_index 249# @FUNCTION: get_last_version_component_index
268# @USAGE: [version] 250# @USAGE: [version]
269# @DESCRIPTION: 251# @DESCRIPTION:
270# What is the index of the last version component in $1 (defaults to $PV)? 252# What is the index of the last version component in $1 (defaults to $PV)?
271# Equivalent to get_version_component_count - 1. 253# Equivalent to get_version_component_count - 1.
272# 1.0.1 -> 3 254# 1.0.1 -> 2
273# 3.0c-r1 -> 4 255# 3.0c-r1 -> 3
274get_last_version_component_index() { 256get_last_version_component_index() {
275 eshopts_push -s extglob
276 echo $(( $(get_version_component_count "${1:-${PV}}" ) - 1 )) 257 echo $(($(get_version_component_count "${1:-${PV}}" ) - 1))
277 eshopts_pop
278} 258}
279 259
280# @FUNCTION: version_is_at_least 260# @FUNCTION: version_is_at_least
281# @USAGE: <want> [have] 261# @USAGE: <want> [have]
282# @DESCRIPTION: 262# @DESCRIPTION:
283# Is $2 (defaults to $PVR) at least version $1? Intended for use in eclasses 263# Is $2 (defaults to $PVR) at least version $1? Intended for use in eclasses
284# only. May not be reliable, be sure to do very careful testing before actually 264# only. May not be reliable, be sure to do very careful testing before actually
285# using this. 265# using this.
286version_is_at_least() { 266version_is_at_least() {
287 eshopts_push -s extglob
288 local want_s="$1" have_s="${2:-${PVR}}" r 267 local want_s="$1" have_s="${2:-${PVR}}" r
289 version_compare "${want_s}" "${have_s}" 268 version_compare "${want_s}" "${have_s}"
290 r=$? 269 r=$?
291 case $r in 270 case $r in
292 1|2) 271 1|2)
293 eshopts_pop
294 return 0 272 return 0
295 ;; 273 ;;
296 3) 274 3)
297 eshopts_pop
298 return 1 275 return 1
299 ;; 276 ;;
300 *) 277 *)
301 eshopts_pop
302 die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]" 278 die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]"
303 ;; 279 ;;
304 esac 280 esac
305 eshopts_pop
306} 281}
307 282
308# @FUNCTION: version_compare 283# @FUNCTION: version_compare
309# @USAGE: <A> <B> 284# @USAGE: <A> <B>
310# @DESCRIPTION: 285# @DESCRIPTION:
312# than B, returns 1. If A is identical to B, return 2. If A is later than B, 287# than B, returns 1. If A is identical to B, return 2. If A is later than B,
313# return 3. You probably want version_is_at_least rather than this function. 288# return 3. You probably want version_is_at_least rather than this function.
314# May not be very reliable. Test carefully before using this. 289# May not be very reliable. Test carefully before using this.
315version_compare() { 290version_compare() {
316 eshopts_push -s extglob 291 eshopts_push -s extglob
317 local ver_a=${1} ver_b=${2} parts_a parts_b cur_idx_a=0 cur_idx_b=0 292 local ver_a=${1} ver_b=${2} parts_a parts_b
293 local cur_tok_a cur_tok_b num_part_a num_part_b
294 local -i cur_idx_a=0 cur_idx_b=0 prev_idx_a prev_idx_b
318 parts_a=( $(get_all_version_components "${ver_a}" ) ) 295 parts_a=( $(get_all_version_components "${ver_a}" ) )
319 parts_b=( $(get_all_version_components "${ver_b}" ) ) 296 parts_b=( $(get_all_version_components "${ver_b}" ) )
320 297
321 ### compare number parts. 298 ### compare number parts.
322 local inf_loop=0 299 local -i inf_loop=0
323 while true ; do 300 while true; do
324 inf_loop=$(( ${inf_loop} + 1 )) 301 inf_loop+=1
325 [[ ${inf_loop} -gt 20 ]] && \ 302 ((inf_loop > 20)) && \
326 die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]" 303 die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]"
327 304
305 # Store the current index to test later
306 prev_idx_a=cur_idx_a
307 prev_idx_b=cur_idx_b
308
328 # grab the current number components 309 # grab the current number components
329 local cur_tok_a=${parts_a[${cur_idx_a}]} 310 cur_tok_a=${parts_a[cur_idx_a]}
330 local cur_tok_b=${parts_b[${cur_idx_b}]} 311 cur_tok_b=${parts_b[cur_idx_b]}
331 312
332 # number? 313 # number?
333 if [[ -n ${cur_tok_a} ]] && [[ -z ${cur_tok_a//[[:digit:]]} ]] ; then 314 if [[ -n ${cur_tok_a} ]] && [[ -z ${cur_tok_a//[[:digit:]]} ]] ; then
334 cur_idx_a=$(( ${cur_idx_a} + 1 )) 315 cur_idx_a+=1
335 [[ ${parts_a[${cur_idx_a}]} == "." ]] \ 316 [[ ${parts_a[cur_idx_a]} == . ]] \
336 && cur_idx_a=$(( ${cur_idx_a} + 1 )) 317 && cur_idx_a+=1
337 else 318 else
338 cur_tok_a="" 319 cur_tok_a=
339 fi 320 fi
340 321
341 if [[ -n ${cur_tok_b} ]] && [[ -z ${cur_tok_b//[[:digit:]]} ]] ; then 322 if [[ -n ${cur_tok_b} ]] && [[ -z ${cur_tok_b//[[:digit:]]} ]] ; then
342 cur_idx_b=$(( ${cur_idx_b} + 1 )) 323 cur_idx_b+=1
343 [[ ${parts_b[${cur_idx_b}]} == "." ]] \ 324 [[ ${parts_b[cur_idx_b]} == . ]] \
344 && cur_idx_b=$(( ${cur_idx_b} + 1 )) 325 && cur_idx_b+=1
345 else 326 else
346 cur_tok_b="" 327 cur_tok_b=
347 fi 328 fi
348 329
349 # done with number components? 330 # done with number components?
350 [[ -z ${cur_tok_a} ]] && [[ -z ${cur_tok_b} ]] && break 331 [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]] && break
351 332
333 # if a component is blank, then it is the lesser value
334 [[ -z ${cur_tok_a} ]] && eshopts_pop && return 1
335 [[ -z ${cur_tok_b} ]] && eshopts_pop && return 3
336
337 # According to PMS, if we are *not* in the first number part, and either
338 # token begins with "0", then we use a different algorithm (that
339 # effectively does floating point comparison)
340 if (( prev_idx_a != 0 && prev_idx_b != 0 )) \
341 && [[ ${cur_tok_a} == 0* || ${cur_tok_b} == 0* ]] ; then
342
343 # strip trailing zeros
344 cur_tok_a=${cur_tok_a%%+(0)}
345 cur_tok_b=${cur_tok_b%%+(0)}
346
347 # do a *string* comparison of the resulting values: 2 > 11
348 [[ ${cur_tok_a} < ${cur_tok_b} ]] && eshopts_pop && return 1
349 [[ ${cur_tok_a} > ${cur_tok_b} ]] && eshopts_pop && return 3
350 else
352 # to avoid going into octal mode, strip any leading zeros. otherwise 351 # to avoid going into octal mode, strip any leading zeros. otherwise
353 # bash will throw a hissy fit on versions like 6.3.068. 352 # bash will throw a hissy fit on versions like 6.3.068.
354 cur_tok_a=${cur_tok_a##+(0)} 353 cur_tok_a=${cur_tok_a##+(0)}
355 cur_tok_b=${cur_tok_b##+(0)} 354 cur_tok_b=${cur_tok_b##+(0)}
356 355
357 # if a component is blank, make it zero. 356 # now if a component is blank, it was originally 0 -- make it so
358 [[ -z ${cur_tok_a} ]] && cur_tok_a=0 357 : ${cur_tok_a:=0}
359 [[ -z ${cur_tok_b} ]] && cur_tok_b=0 358 : ${cur_tok_b:=0}
360 359
361 # compare 360 # compare
362 [[ ${cur_tok_a} -lt ${cur_tok_b} ]] && eshopts_pop && return 1 361 ((cur_tok_a < cur_tok_b)) && eshopts_pop && return 1
363 [[ ${cur_tok_a} -gt ${cur_tok_b} ]] && eshopts_pop && return 3 362 ((cur_tok_a > cur_tok_b)) && eshopts_pop && return 3
363 fi
364 done 364 done
365 365
366 ### number parts equal. compare letter parts. 366 ### number parts equal. compare letter parts.
367 local letter_a= 367 local letter_a=
368 letter_a=${parts_a[${cur_idx_a}]} 368 letter_a=${parts_a[cur_idx_a]}
369 if [[ ${#letter_a} -eq 1 ]] && [[ -z ${letter_a/[a-z]} ]] ; then 369 if [[ ${#letter_a} -eq 1 && -z ${letter_a/[a-z]} ]] ; then
370 cur_idx_a=$(( ${cur_idx_a} + 1 )) 370 cur_idx_a+=1
371 else 371 else
372 letter_a="@" 372 letter_a=@
373 fi 373 fi
374 374
375 local letter_b= 375 local letter_b=
376 letter_b=${parts_b[${cur_idx_b}]} 376 letter_b=${parts_b[cur_idx_b]}
377 if [[ ${#letter_b} -eq 1 ]] && [[ -z ${letter_b/[a-z]} ]] ; then 377 if [[ ${#letter_b} -eq 1 && -z ${letter_b/[a-z]} ]] ; then
378 cur_idx_b=$(( ${cur_idx_b} + 1 )) 378 cur_idx_b+=1
379 else 379 else
380 letter_b="@" 380 letter_b=@
381 fi 381 fi
382 382
383 # compare 383 # compare
384 [[ ${letter_a} < ${letter_b} ]] && eshopts_pop && return 1 384 [[ ${letter_a} < ${letter_b} ]] && eshopts_pop && return 1
385 [[ ${letter_a} > ${letter_b} ]] && eshopts_pop && return 3 385 [[ ${letter_a} > ${letter_b} ]] && eshopts_pop && return 3
386 386
387 ### letter parts equal. compare suffixes in order. 387 ### letter parts equal. compare suffixes in order.
388 local suffix rule part r_lt r_gt 388 inf_loop=0
389 for rule in "alpha=1" "beta=1" "pre=1" "rc=1" "p=3" "r=3" ; do 389 while true ; do
390 suffix=${rule%%=*} 390 inf_loop+=1
391 r_lt=${rule##*=} 391 ((inf_loop > 20)) && \
392 [[ ${r_lt} -eq 1 ]] && r_gt=3 || r_gt=1 392 die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]"
393 [[ ${parts_a[cur_idx_a]} == _ ]] && ((cur_idx_a++))
394 [[ ${parts_b[cur_idx_b]} == _ ]] && ((cur_idx_b++))
393 395
396 cur_tok_a=${parts_a[cur_idx_a]}
397 cur_tok_b=${parts_b[cur_idx_b]}
398 num_part_a=0
399 num_part_b=0
400
401 if has ${cur_tok_a%%+([0-9])} "alpha" "beta" "pre" "rc" "p"; then
402 cur_idx_a+=1
403 num_part_a=${cur_tok_a##+([a-z])}
404 # I don't like octal
405 num_part_a=${num_part_a##+(0)}
406 : ${num_part_a:=0}
407 cur_tok_a=${cur_tok_a%%+([0-9])}
408 else
409 cur_tok_a=
410 fi
411
412 if has ${cur_tok_b%%+([0-9])} alpha beta pre rc p; then
413 cur_idx_b+=1
414 num_part_b=${cur_tok_b##+([a-z])}
415 # I still don't like octal
416 num_part_b=${num_part_b##+(0)}
417 : ${num_part_b:=0}
418 cur_tok_b=${cur_tok_b%%+([0-9])}
419 else
420 cur_tok_b=
421 fi
422
423 if [[ ${cur_tok_a} != ${cur_tok_b} ]]; then
394 local suffix_a= 424 local suffix
395 for part in ${parts_a[@]} ; do 425 for suffix in alpha beta pre rc "" p; do
396 [[ ${part#${suffix}} != ${part} ]] && \ 426 [[ ${cur_tok_a} == ${suffix} ]] && eshopts_pop && return 1
397 [[ -z ${part##${suffix}*([[:digit:]])} ]] && \ 427 [[ ${cur_tok_b} == ${suffix} ]] && eshopts_pop && return 3
398 suffix_a=${part#${suffix}}0
399 done 428 done
400 429 elif [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]]; then
401 local suffix_b= 430 break
402 for part in ${parts_b[@]} ; do 431 else
403 [[ ${part#${suffix}} != ${part} ]] && \ 432 ((num_part_a < num_part_b)) && eshopts_pop && return 1
404 [[ -z ${part##${suffix}*([[:digit:]])} ]] && \ 433 ((num_part_a > num_part_b)) && eshopts_pop && return 3
405 suffix_b=${part#${suffix}}0 434 fi
406 done 435 done
407 436
408 [[ -z ${suffix_a} ]] && [[ -z ${suffix_b} ]] && continue 437 # At this point, the only thing that should be left is the -r# part
438 [[ ${parts_a[cur_idx_a]} == - ]] && ((cur_idx_a++))
439 [[ ${parts_b[cur_idx_b]} == - ]] && ((cur_idx_b++))
409 440
410 [[ -z ${suffix_a} ]] && eshopts_pop && return ${r_gt} 441 # Sanity check
411 [[ -z ${suffix_b} ]] && eshopts_pop && return ${r_lt} 442 if [[ ${parts_a[cur_idx_a]/r+([0-9])} || ${parts_b[cur_idx_b]/r+([0-9])} ]]; then
443 die "versionator compare bug [revisions, ${ver_a}, ${ver_b}]"
444 fi
412 445
413 # avoid octal problems 446 num_part_a=${parts_a[cur_idx_a]#r}
414 suffix_a=${suffix_a##+(0)} ; suffix_a=${suffix_a:-0} 447 num_part_a=${num_part_a##+(0)}
415 suffix_b=${suffix_b##+(0)} ; suffix_b=${suffix_b:-0} 448 : ${num_part_a:=0}
449 num_part_b=${parts_b[cur_idx_b]#r}
450 num_part_b=${num_part_b##+(0)}
451 : ${num_part_b:=0}
416 452
417 [[ ${suffix_a} -lt ${suffix_b} ]] && eshopts_pop && return 1 453 ((num_part_a < num_part_b)) && eshopts_pop && return 1
418 [[ ${suffix_a} -gt ${suffix_b} ]] && eshopts_pop && return 3 454 ((num_part_a > num_part_b)) && eshopts_pop && return 3
419 done
420 455
421 ### no differences. 456 ### no differences.
422 eshopts_pop 457 eshopts_pop
423 return 2 458 return 2
424} 459}
429# Returns its parameters sorted, highest version last. We're using a quadratic 464# Returns its parameters sorted, highest version last. We're using a quadratic
430# algorithm for simplicity, so don't call it with more than a few dozen items. 465# algorithm for simplicity, so don't call it with more than a few dozen items.
431# Uses version_compare, so be careful. 466# Uses version_compare, so be careful.
432version_sort() { 467version_sort() {
433 eshopts_push -s extglob 468 eshopts_push -s extglob
469 local items=
434 local items= left=0 470 local -i left=0
435 items=( $@ ) 471 items=("$@")
436 while [[ ${left} -lt ${#items[@]} ]] ; do 472 while ((left < ${#items[@]})); do
437 local lowest_idx=${left} 473 local -i lowest_idx=left
438 local idx=$(( ${lowest_idx} + 1 )) 474 local -i idx=lowest_idx+1
439 while [[ ${idx} -lt ${#items[@]} ]] ; do 475 while ((idx < ${#items[@]})); do
440 version_compare "${items[${lowest_idx}]}" "${items[${idx}]}" 476 version_compare "${items[lowest_idx]}" "${items[idx]}"
441 [[ $? -eq 3 ]] && lowest_idx=${idx} 477 [[ $? -eq 3 ]] && lowest_idx=idx
442 idx=$(( ${idx} + 1 )) 478 idx+=1
443 done 479 done
444 local tmp=${items[${lowest_idx}]} 480 local tmp=${items[lowest_idx]}
445 items[${lowest_idx}]=${items[${left}]} 481 items[lowest_idx]=${items[left]}
446 items[${left}]=${tmp} 482 items[left]=${tmp}
447 left=$(( ${left} + 1 )) 483 left+=1
448 done 484 done
449 echo ${items[@]} 485 echo ${items[@]}
450 eshopts_pop 486 eshopts_pop
451} 487}
452 488
454# @USAGE: <format> [version] 490# @USAGE: <format> [version]
455# @DESCRIPTION: 491# @DESCRIPTION:
456# Reformat complicated version strings. The first argument is the string 492# Reformat complicated version strings. The first argument is the string
457# to reformat with while the rest of the args are passed on to the 493# to reformat with while the rest of the args are passed on to the
458# get_version_components function. You should make sure to single quote 494# get_version_components function. You should make sure to single quote
459# the first argument since it'll have variables that get delayed expansion.s 495# the first argument since it'll have variables that get delayed expansions.
460# @EXAMPLE: 496# @EXAMPLE:
461# P="cow-hat-1.2.3_p4" 497# P="cow-hat-1.2.3_p4"
462# MY_P=$(version_format_string '${PN}_source_$1_$2-$3_$4') 498# MY_P=$(version_format_string '${PN}_source_$1_$2-$3_$4')
463# Now MY_P will be: cow-hat_source_1_2-3_p4 499# Now MY_P will be: cow-hat_source_1_2-3_p4
464version_format_string() { 500version_format_string() {
505 2.1 $gt 1.2 541 2.1 $gt 1.2
506 542
507 1.2.3 $lt 1.2.4 543 1.2.3 $lt 1.2.4
508 1.2.4 $gt 1.2.3 544 1.2.4 $gt 1.2.3
509 545
510 1.2.0 $eq 1.2 546 1.2.0 $gt 1.2
511 1.2.1 $gt 1.2 547 1.2.1 $gt 1.2
512 1.2 $lt 1.2.1 548 1.2 $lt 1.2.1
513 549
514 1.2b $eq 1.2b 550 1.2b $eq 1.2b
515 1.2b $lt 1.2c 551 1.2b $lt 1.2c
529 1.0_p1-r1 $gt 1.0_p1 565 1.0_p1-r1 $gt 1.0_p1
530 566
531 1.0_alpha6-r1 $gt 1.0_alpha6 567 1.0_alpha6-r1 $gt 1.0_alpha6
532 1.0_beta6-r1 $gt 1.0_alpha6-r2 568 1.0_beta6-r1 $gt 1.0_alpha6-r2
533 569
534 1.0_pre1 $lt 1.0-p1 570 1.0_pre1 $lt 1.0_p1
535 571
536 1.0p $gt 1.0_p1 572 1.0p $gt 1.0_p1
537 1.0r $gt 1.0-r1 573 1.0r $gt 1.0-r1
538 1.6.15 $gt 1.6.10-r2 574 1.6.15 $gt 1.6.10-r2
539 1.6.10-r2 $lt 1.6.15 575 1.6.10-r2 $lt 1.6.15
542 [[ -z "${a}${b}${c}" ]] && continue; 578 [[ -z "${a}${b}${c}" ]] && continue;
543 __versionator__test_version_compare_t "${a}" "${b}" "${c}" 579 __versionator__test_version_compare_t "${a}" "${b}" "${c}"
544 done 580 done
545 581
546 582
547 for q in "alpha beta pre rc=${lt};${gt}" "p r=${gt};${lt}" ; do 583 for q in "alpha beta pre rc=${lt};${gt}" "p=${gt};${lt}" ; do
548 for p in ${q%%=*} ; do 584 for p in ${q%%=*} ; do
549 local c=${q##*=} 585 local c=${q##*=}
550 local alt=${c%%;*} agt=${c##*;} 586 local alt=${c%%;*} agt=${c##*;}
551 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}" 587 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}"
552 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}1" 588 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}1"
562 598
563 __versionator__test_version_compare_t "1_${p}7" $lt "1_${p}8" 599 __versionator__test_version_compare_t "1_${p}7" $lt "1_${p}8"
564 __versionator__test_version_compare_t "1_${p}7" $eq "1_${p}7" 600 __versionator__test_version_compare_t "1_${p}7" $eq "1_${p}7"
565 __versionator__test_version_compare_t "1_${p}7" $gt "1_${p}6" 601 __versionator__test_version_compare_t "1_${p}7" $gt "1_${p}6"
566 __versionator__test_version_compare_t "1_${p}09" $eq "1_${p}9" 602 __versionator__test_version_compare_t "1_${p}09" $eq "1_${p}9"
603
604 __versionator__test_version_compare_t "1_${p}7-r0" $eq "1_${p}7"
605 __versionator__test_version_compare_t "1_${p}7-r0" $lt "1_${p}7-r1"
606 __versionator__test_version_compare_t "1_${p}7-r0" $lt "1_${p}7-r01"
607 __versionator__test_version_compare_t "1_${p}7-r01" $eq "1_${p}7-r1"
608 __versionator__test_version_compare_t "1_${p}8-r1" $gt "1_${p}7-r100"
609
610 __versionator__test_version_compare_t "1_${p}_alpha" $lt "1_${p}_beta"
567 done 611 done
568 done 612 done
569 613
570 for p in "-r" "_p" ; do 614 for p in "-r" "_p" ; do
571 __versionator__test_version_compare_t "7.2${p}1" $lt "7.2${p}2" 615 __versionator__test_version_compare_t "7.2${p}1" $lt "7.2${p}2"
572 __versionator__test_version_compare_t "7.2${p}2" $gt "7.2${p}1" 616 __versionator__test_version_compare_t "7.2${p}2" $gt "7.2${p}1"
573 __versionator__test_version_compare_t "7.2${p}3" $gt "7.2${p}2" 617 __versionator__test_version_compare_t "7.2${p}3" $gt "7.2${p}2"
574 __versionator__test_version_compare_t "7.2${p}2" $lt "7.2${p}3" 618 __versionator__test_version_compare_t "7.2${p}2" $lt "7.2${p}3"
575 done 619 done
620
621 # The following tests all come from portage's test cases:
622 __versionator__test_version_compare_t "6.0" $gt "5.0"
623 __versionator__test_version_compare_t "5.0" $gt "5"
624 __versionator__test_version_compare_t "1.0-r1" $gt "1.0-r0"
625 __versionator__test_version_compare_t "1.0-r1" $gt "1.0"
626 __versionator__test_version_compare_t "999999999999999999999999999999" $gt "999999999999999999999999999998"
627 __versionator__test_version_compare_t "1.0.0" $gt "1.0"
628 __versionator__test_version_compare_t "1.0.0" $gt "1.0b"
629 __versionator__test_version_compare_t "1b" $gt "1"
630 __versionator__test_version_compare_t "1b_p1" $gt "1_p1"
631 __versionator__test_version_compare_t "1.1b" $gt "1.1"
632 __versionator__test_version_compare_t "12.2.5" $gt "12.2b"
633
634 __versionator__test_version_compare_t "4.0" $lt "5.0"
635 __versionator__test_version_compare_t "5" $lt "5.0"
636 __versionator__test_version_compare_t "1.0_pre2" $lt "1.0_p2"
637 __versionator__test_version_compare_t "1.0_alpha2" $lt "1.0_p2"
638 __versionator__test_version_compare_t "1.0_alpha1" $lt "1.0_beta1"
639 __versionator__test_version_compare_t "1.0_beta3" $lt "1.0_rc3"
640 __versionator__test_version_compare_t "1.001000000000000000001" $lt "1.001000000000000000002"
641 __versionator__test_version_compare_t "1.00100000000" $lt "1.0010000000000000001"
642 __versionator__test_version_compare_t "999999999999999999999999999998" $lt "999999999999999999999999999999"
643 __versionator__test_version_compare_t "1.01" $lt "1.1"
644 __versionator__test_version_compare_t "1.0-r0" $lt "1.0-r1"
645 __versionator__test_version_compare_t "1.0" $lt "1.0-r1"
646 __versionator__test_version_compare_t "1.0" $lt "1.0.0"
647 __versionator__test_version_compare_t "1.0b" $lt "1.0.0"
648 __versionator__test_version_compare_t "1_p1" $lt "1b_p1"
649 __versionator__test_version_compare_t "1" $lt "1b"
650 __versionator__test_version_compare_t "1.1" $lt "1.1b"
651 __versionator__test_version_compare_t "12.2b" $lt "12.2.5"
652
653 __versionator__test_version_compare_t "4.0" $eq "4.0"
654 __versionator__test_version_compare_t "1.0" $eq "1.0"
655 __versionator__test_version_compare_t "1.0-r0" $eq "1.0"
656 __versionator__test_version_compare_t "1.0" $eq "1.0-r0"
657 __versionator__test_version_compare_t "1.0-r0" $eq "1.0-r0"
658 __versionator__test_version_compare_t "1.0-r1" $eq "1.0-r1"
659
660 # The following were just tests for != in portage, we need something a bit
661 # more precise
662 __versionator__test_version_compare_t "1" $lt "2"
663 __versionator__test_version_compare_t "1.0_alpha" $lt "1.0_pre"
664 __versionator__test_version_compare_t "1.0_beta" $gt "1.0_alpha"
665 __versionator__test_version_compare_t "0" $lt "0.0"
666 __versionator__test_version_compare_t "1.0-r0" $lt "1.0-r1"
667 __versionator__test_version_compare_t "1.0-r1" $gt "1.0-r0"
668 __versionator__test_version_compare_t "1.0" $lt "1.0-r1"
669 __versionator__test_version_compare_t "1.0-r1" $gt "1.0"
670 __versionator__test_version_compare_t "1_p1" $lt "1b_p1"
671 __versionator__test_version_compare_t "1b" $gt "1"
672 __versionator__test_version_compare_t "1.1b" $gt "1.1"
673 __versionator__test_version_compare_t "12.2b" $gt "12.2"
674
675 # The following tests all come from paludis's test cases:
676 __versionator__test_version_compare_t "1.0" $gt "1"
677 __versionator__test_version_compare_t "1" $lt "1.0"
678 __versionator__test_version_compare_t "1.0_alpha" $gt "1_alpha"
679 __versionator__test_version_compare_t "1.0_alpha" $gt "1"
680 __versionator__test_version_compare_t "1.0_alpha" $lt "1.0"
681 __versionator__test_version_compare_t "1.2.0.0_alpha7-r4" $gt "1.2_alpha7-r4"
682
683 __versionator__test_version_compare_t "0001" $eq "1"
684 __versionator__test_version_compare_t "01" $eq "001"
685 __versionator__test_version_compare_t "0001.1" $eq "1.1"
686 __versionator__test_version_compare_t "01.01" $eq "1.01"
687 __versionator__test_version_compare_t "1.010" $eq "1.01"
688 __versionator__test_version_compare_t "1.00" $eq "1.0"
689 __versionator__test_version_compare_t "1.0100" $eq "1.010"
690 __versionator__test_version_compare_t "1" $eq "1-r0"
691 __versionator__test_version_compare_t "1-r00" $eq "1-r0"
692
576 eshopts_pop 693 eshopts_pop
577} 694}

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.20