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

Diff of /eclass/versionator.eclass

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

Revision 1.11 Revision 1.20
1# Copyright 1999-2004 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.11 2006/08/30 16:14:13 spb Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.20 2011/11/22 18:42:10 vapier Exp $
4# 4
5# Original Author: Ciaran McCreesh <ciaranm@gentoo.org> 5# @ECLASS: versionator.eclass
6# 6# @MAINTAINER:
7# Jonathan Callen <abcd@gentoo.org>
8# base-system@gentoo.org
9# @BLURB: functions which simplify manipulation of ${PV} and similar version strings
10# @DESCRIPTION:
7# This eclass provides functions which simplify manipulating $PV and similar 11# This eclass provides functions which simplify manipulating $PV and similar
8# variables. Most functions default to working with $PV, although other 12# variables. Most functions default to working with $PV, although other
9# values can be used. 13# values can be used.
10# 14# @EXAMPLE:
11# Simple Example 1: $PV is 1.2.3b, we want 1_2.3b: 15# Simple Example 1: $PV is 1.2.3b, we want 1_2.3b:
12# MY_PV=$(replace_version_separator 1 '_' ) 16# MY_PV=$(replace_version_separator 1 '_' )
13# 17#
14# Simple Example 2: $PV is 1.4.5, we want 1: 18# Simple Example 2: $PV is 1.4.5, we want 1:
15# MY_MAJORV=$(get_major_version ) 19# MY_MAJORV=$(get_major_version )
16#
17# Full list of user usable functions provided by this eclass (see the functions
18# themselves for documentation):
19# get_all_version_components ver_str
20# get_version_components ver_str
21# get_major_version ver_str
22# get_version_component_range range ver_str
23# get_after_major_version ver_str
24# replace_version_separator index newvalue ver_str
25# replace_all_version_separators newvalue ver_str
26# delete_version_separator index ver_str
27# delete_all_version_separators ver_str
28# get_version_component_count ver_str
29# get_last_version_component_index ver_str
30# 20#
31# Rather than being a number, the index parameter can be a separator character 21# Rather than being a number, the index parameter can be a separator character
32# such as '-', '.' or '_'. In this case, the first separator of this kind is 22# such as '-', '.' or '_'. In this case, the first separator of this kind is
33# selected. 23# selected.
34# 24#
35# There's also: 25# There's also:
36# version_is_at_least want have 26# version_is_at_least want have
37# which may be buggy, so use with caution. 27# which may be buggy, so use with caution.
38 28
39shopt -s extglob 29inherit eutils
40 30
31# @FUNCTION: get_all_version_components
32# @USAGE: [version]
33# @DESCRIPTION:
41# Split up a version string into its component parts. If no parameter is 34# Split up a version string into its component parts. If no parameter is
42# supplied, defaults to $PV. 35# supplied, defaults to $PV.
43# 0.8.3 -> 0 . 8 . 3 36# 0.8.3 -> 0 . 8 . 3
44# 7c -> 7 c 37# 7c -> 7 c
45# 3.0_p2 -> 3 . 0 _ p2 38# 3.0_p2 -> 3 . 0 _ p2
46# 20040905 -> 20040905 39# 20040905 -> 20040905
47# 3.0c-r1 -> 3 . 0 c - r1 40# 3.0c-r1 -> 3 . 0 c - r1
48get_all_version_components() { 41get_all_version_components() {
42 eshopts_push -s extglob
49 local ver_str=${1:-${PV}} result result_idx=0 43 local ver_str=${1:-${PV}} result
50 result=( ) 44 result=()
51 45
52 # 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
53 # times. 47 # times.
54 if [[ "${VERSIONATOR_CACHE_VER_STR}" == "${ver_str}" ]] ; then 48 if [[ ${VERSIONATOR_CACHE_VER_STR} == ${ver_str} ]] ; then
55 echo ${VERSIONATOR_CACHE_RESULT} 49 echo ${VERSIONATOR_CACHE_RESULT}
50 eshopts_pop
56 return 51 return
57 fi 52 fi
58 export VERSIONATOR_CACHE_VER_STR="${ver_str}" 53 export VERSIONATOR_CACHE_VER_STR=${ver_str}
59 54
60 while [[ -n "$ver_str" ]] ; do 55 while [[ -n $ver_str ]] ; do
61 case "${ver_str:0:1}" in 56 case "${ver_str::1}" in
62 # number: parse whilst we have a number 57 # number: parse whilst we have a number
63 [[:digit:]]) 58 [[:digit:]])
64 result[$result_idx]="${ver_str%%[^[:digit:]]*}" 59 result+=("${ver_str%%[^[:digit:]]*}")
65 ver_str="${ver_str##+([[:digit:]])}" 60 ver_str=${ver_str##+([[:digit:]])}
66 result_idx=$(($result_idx + 1))
67 ;; 61 ;;
68 62
69 # separator: single character 63 # separator: single character
70 [-_.]) 64 [-_.])
71 result[$result_idx]="${ver_str:0:1}" 65 result+=("${ver_str::1}")
72 ver_str="${ver_str:1}" 66 ver_str=${ver_str:1}
73 result_idx=$(($result_idx + 1))
74 ;; 67 ;;
75 68
76 # letter: grab the letters plus any following numbers 69 # letter: grab the letters plus any following numbers
77 [[:alpha:]]) 70 [[:alpha:]])
78 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
79 result[$result_idx]=${ver_str:0:$((${#ver_str} - ${#not_match}))} 73 result+=("${ver_str::${#ver_str} - ${#not_match}}")
80 ver_str="${not_match}" 74 ver_str=${not_match}
81 result_idx=$(($result_idx + 1))
82 ;; 75 ;;
83 76
84 # huh? 77 # huh?
85 *) 78 *)
86 result[$result_idx]="${ver_str:0:1}" 79 result+=("${ver_str::1}")
87 ver_str="${ver_str:1}" 80 ver_str=${ver_str:1}
88 result_idx=$(($result_idx + 1))
89 ;; 81 ;;
90 esac 82 esac
91 done 83 done
92 84
93 export VERSIONATOR_CACHE_RESULT="${result[@]}" 85 export VERSIONATOR_CACHE_RESULT=${result[*]}
94 echo ${result[@]} 86 echo ${result[@]}
87 eshopts_pop
95} 88}
96 89
90# @FUNCTION: get_version_components
91# @USAGE: [version]
92# @DESCRIPTION:
97# Get the important version components, excluding '.', '-' and '_'. Defaults to 93# Get the important version components, excluding '.', '-' and '_'. Defaults to
98# $PV if no parameter is supplied. 94# $PV if no parameter is supplied.
99# 0.8.3 -> 0 8 3 95# 0.8.3 -> 0 8 3
100# 7c -> 7 c 96# 7c -> 7 c
101# 3.0_p2 -> 3 0 p2 97# 3.0_p2 -> 3 0 p2
102# 20040905 -> 20040905 98# 20040905 -> 20040905
103# 3.0c-r1 -> 3 0 c r1 99# 3.0c-r1 -> 3 0 c r1
104get_version_components() { 100get_version_components() {
105 local c="$(get_all_version_components "${1:-${PV}}")" 101 local c=$(get_all_version_components "${1:-${PV}}")
106 c=( ${c[@]//[-._]/ } ) 102 echo ${c//[-._]/ }
107 echo ${c[@]}
108} 103}
109 104
105# @FUNCTION: get_major_version
106# @USAGE: [version]
107# @DESCRIPTION:
110# Get the major version of a value. Defaults to $PV if no parameter is supplied. 108# Get the major version of a value. Defaults to $PV if no parameter is supplied.
111# 0.8.3 -> 0 109# 0.8.3 -> 0
112# 7c -> 7 110# 7c -> 7
113# 3.0_p2 -> 3 111# 3.0_p2 -> 3
114# 20040905 -> 20040905 112# 20040905 -> 20040905
115# 3.0c-r1 -> 3 113# 3.0c-r1 -> 3
116get_major_version() { 114get_major_version() {
117 local c
118 c=( $(get_all_version_components "${1:-${PV}}" ) ) 115 local c=($(get_all_version_components "${1:-${PV}}"))
119 echo ${c[0]} 116 echo ${c[0]}
120} 117}
121 118
119# @FUNCTION: get_version_component_range
120# @USAGE: <range> [version]
121# @DESCRIPTION:
122# 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
123# version parameter is supplied, defaults to $PV. 123# version parameter is supplied, defaults to $PV.
124# 1 1.2.3 -> 1 124# 1 1.2.3 -> 1
125# 1-2 1.2.3 -> 1.2 125# 1-2 1.2.3 -> 1.2
126# 2- 1.2.3 -> 2.3 126# 2- 1.2.3 -> 2.3
127get_version_component_range() { 127get_version_component_range() {
128 eshopts_push -s extglob
128 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
129 c=( $(get_all_version_components ${v} ) ) 131 c=($(get_all_version_components "${v}"))
130 range_start="${range%-*}" ; range_start="${range_start:-1}" 132 range_start=${range%-*}; range_start=${range_start:-1}
131 range_end="${range#*-}" ; range_end="${range_end:-${#c[@]}}" 133 range_end=${range#*-} ; range_end=${range_end:-${#c[@]}}
132 134
133 while (( j < ${range_start} )) ; do 135 while ((j < range_start)); do
134 i=$(($i + 1)) 136 i+=1
135 [[ $i -gt ${#c[@]} ]] && return 137 ((i > ${#c[@]})) && eshopts_pop && return
136 [[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1)) 138 [[ -n "${c[i]//[-._]}" ]] && j+=1
137 done 139 done
138 140
139 while (( j <= ${range_end} )) ; do 141 while ((j <= range_end)); do
140 echo -n ${c[$i]} 142 echo -n ${c[i]}
141 [[ $i -gt ${#c[@]} ]] && return 143 ((i > ${#c[@]})) && eshopts_pop && return
142 [[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1)) 144 [[ -n "${c[i]//[-._]}" ]] && j+=1
143 i=$(($i + 1)) 145 i+=1
144 done 146 done
147 eshopts_pop
145} 148}
146 149
150# @FUNCTION: get_after_major_version
151# @USAGE: [version]
152# @DESCRIPTION:
147# Get everything after the major version and its separator (if present) of a 153# Get everything after the major version and its separator (if present) of a
148# value. Defaults to $PV if no parameter is supplied. 154# value. Defaults to $PV if no parameter is supplied.
149# 0.8.3 -> 8.3 155# 0.8.3 -> 8.3
150# 7c -> c 156# 7c -> c
151# 3.0_p2 -> 0_p2 157# 3.0_p2 -> 0_p2
152# 20040905 -> (empty string) 158# 20040905 -> (empty string)
153# 3.0c-r1 -> 0c-r1 159# 3.0c-r1 -> 0c-r1
154get_after_major_version() { 160get_after_major_version() {
155 echo $(get_version_component_range 2- "${1:-${PV}}" ) 161 echo $(get_version_component_range 2- "${1:-${PV}}")
156} 162}
157 163
164# @FUNCTION: replace_version_separator
165# @USAGE: <search> <replacement> [subject]
166# @DESCRIPTION:
158# Replace the $1th separator with $2 in $3 (defaults to $PV if $3 is not 167# Replace the $1th separator with $2 in $3 (defaults to $PV if $3 is not
159# supplied). If there are fewer than $1 separators, don't change anything. 168# supplied). If there are fewer than $1 separators, don't change anything.
160# 1 '_' 1.2.3 -> 1_2.3 169# 1 '_' 1.2.3 -> 1_2.3
161# 2 '_' 1.2.3 -> 1.2_3 170# 2 '_' 1.2.3 -> 1.2_3
162# 1 '_' 1b-2.3 -> 1b_2.3 171# 1 '_' 1b-2.3 -> 1b_2.3
163# 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 '-', '.'
164# 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.
165replace_version_separator() { 174replace_version_separator() {
175 eshopts_push -s extglob
166 local w i c found=0 v="${3:-${PV}}" 176 local w c v="${3:-${PV}}"
177 declare -i i found=0
167 w=${1:-1} 178 w=${1:-1}
168 c=( $(get_all_version_components ${v} ) ) 179 c=($(get_all_version_components ${v}))
169 if [[ "${w//[[:digit:]]/}" == "${w}" ]] ; then 180 if [[ ${w} != *[[:digit:]]* ]] ; then
170 # it's a character, not an index 181 # it's a character, not an index
171 for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do 182 for ((i = 0; i < ${#c[@]}; i++)); do
172 if [[ "${c[${i}]}" == "${w}" ]] ; then 183 if [[ ${c[i]} == ${w} ]]; then
173 c[${i}]="${2}" 184 c[i]=${2}
174 break 185 break
175 fi 186 fi
176 done 187 done
177 else 188 else
178 for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do 189 for ((i = 0; i < ${#c[@]}; i++)); do
179 if [[ -n "${c[${i}]//[^-._]}" ]] ; then 190 if [[ -n "${c[i]//[^-._]}" ]]; then
180 found=$(($found + 1)) 191 found+=1
181 if [[ "$found" == "${w}" ]] ; then 192 if ((found == w)); then
182 c[${i}]="${2}" 193 c[i]=${2}
183 break 194 break
184 fi 195 fi
185 fi 196 fi
186 done 197 done
187 fi 198 fi
188 c=${c[@]} 199 c=${c[*]}
189 echo ${c// } 200 echo ${c// }
201 eshopts_pop
190} 202}
191 203
204# @FUNCTION: replace_all_version_separators
205# @USAGE: <replacement> [subject]
206# @DESCRIPTION:
192# Replace all version separators in $2 (defaults to $PV) with $1. 207# Replace all version separators in $2 (defaults to $PV) with $1.
193# '_' 1b.2.3 -> 1b_2_3 208# '_' 1b.2.3 -> 1b_2_3
194replace_all_version_separators() { 209replace_all_version_separators() {
195 local c
196 c=( $(get_all_version_components "${2:-${PV}}" ) ) 210 local c=($(get_all_version_components "${2:-${PV}}"))
197 c="${c[@]//[-._]/$1}" 211 c=${c[@]//[-._]/$1}
198 echo ${c// } 212 echo ${c// }
199} 213}
200 214
215# @FUNCTION: delete_version_separator
216# @USAGE: <search> [subject]
217# @DESCRIPTION:
201# Delete the $1th separator in $2 (defaults to $PV if $2 is not supplied). If 218# Delete the $1th separator in $2 (defaults to $PV if $2 is not supplied). If
202# there are fewer than $1 separators, don't change anything. 219# there are fewer than $1 separators, don't change anything.
203# 1 1.2.3 -> 12.3 220# 1 1.2.3 -> 12.3
204# 2 1.2.3 -> 1.23 221# 2 1.2.3 -> 1.23
205# 1 1b-2.3 -> 1b2.3 222# 1 1b-2.3 -> 1b2.3
207# 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.
208delete_version_separator() { 225delete_version_separator() {
209 replace_version_separator "${1}" "" "${2}" 226 replace_version_separator "${1}" "" "${2}"
210} 227}
211 228
229# @FUNCTION: delete_all_version_separators
230# @USAGE: [subject]
231# @DESCRIPTION:
212# Delete all version separators in $1 (defaults to $PV). 232# Delete all version separators in $1 (defaults to $PV).
213# 1b.2.3 -> 1b23 233# 1b.2.3 -> 1b23
214delete_all_version_separators() { 234delete_all_version_separators() {
215 replace_all_version_separators "" "${1}" 235 replace_all_version_separators "" "${1}"
216} 236}
217 237
238# @FUNCTION: get_version_component_count
239# @USAGE: [version]
240# @DESCRIPTION:
218# How many version components are there in $1 (defaults to $PV)? 241# How many version components are there in $1 (defaults to $PV)?
219# 1.0.1 -> 3 242# 1.0.1 -> 3
220# 3.0c-r1 -> 4 243# 3.0c-r1 -> 4
221#
222get_version_component_count() { 244get_version_component_count() {
223 local a
224 a=( $(get_version_components "${1:-${PV}}" ) ) 245 local a=($(get_version_components "${1:-${PV}}"))
225 echo ${#a[@]} 246 echo ${#a[@]}
226} 247}
227 248
249# @FUNCTION: get_last_version_component_index
250# @USAGE: [version]
251# @DESCRIPTION:
228# 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)?
229# Equivalent to get_version_component_count - 1. 253# Equivalent to get_version_component_count - 1.
230# 1.0.1 -> 3 254# 1.0.1 -> 2
231# 3.0c-r1 -> 4 255# 3.0c-r1 -> 3
232#
233get_last_version_component_index() { 256get_last_version_component_index() {
234 echo $(( $(get_version_component_count "${1:-${PV}}" ) - 1 )) 257 echo $(($(get_version_component_count "${1:-${PV}}" ) - 1))
235} 258}
236 259
260# @FUNCTION: version_is_at_least
261# @USAGE: <want> [have]
262# @DESCRIPTION:
237# 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
238# 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
239# using this. Prod ciaranm if you find something it can't handle. 265# using this.
240version_is_at_least() { 266version_is_at_least() {
241 local want_s="$1" have_s="${2:-${PVR}}" r 267 local want_s="$1" have_s="${2:-${PVR}}" r
242 version_compare "${want_s}" "${have_s}" 268 version_compare "${want_s}" "${have_s}"
243 r=$? 269 r=$?
244 case $r in 270 case $r in
252 die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]" 278 die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]"
253 ;; 279 ;;
254 esac 280 esac
255} 281}
256 282
283# @FUNCTION: version_compare
284# @USAGE: <A> <B>
285# @DESCRIPTION:
257# Takes two parameters (a, b) which are versions. If a is an earlier version 286# Takes two parameters (A, B) which are versions. If A is an earlier version
258# than b, returns 1. If a is identical to b, return 2. If b is later than a, 287# than B, returns 1. If A is identical to B, return 2. If A is later than B,
259# 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.
260# May not be very reliable. Test carefully before using this. 289# May not be very reliable. Test carefully before using this.
261version_compare() { 290version_compare() {
291 eshopts_push -s extglob
262 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
263 parts_a=( $(get_all_version_components "${ver_a}" ) ) 295 parts_a=( $(get_all_version_components "${ver_a}" ) )
264 parts_b=( $(get_all_version_components "${ver_b}" ) ) 296 parts_b=( $(get_all_version_components "${ver_b}" ) )
265 297
266 ### compare number parts. 298 ### compare number parts.
267 local inf_loop=0 299 local -i inf_loop=0
268 while true ; do 300 while true; do
269 inf_loop=$(( ${inf_loop} + 1 )) 301 inf_loop+=1
270 [[ ${inf_loop} -gt 20 ]] && \ 302 ((inf_loop > 20)) && \
271 die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]" 303 die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]"
272 304
305 # Store the current index to test later
306 prev_idx_a=cur_idx_a
307 prev_idx_b=cur_idx_b
308
273 # grab the current number components 309 # grab the current number components
274 local cur_tok_a=${parts_a[${cur_idx_a}]} 310 cur_tok_a=${parts_a[cur_idx_a]}
275 local cur_tok_b=${parts_b[${cur_idx_b}]} 311 cur_tok_b=${parts_b[cur_idx_b]}
276 312
277 # number? 313 # number?
278 if [[ -n ${cur_tok_a} ]] && [[ -z ${cur_tok_a//[[:digit:]]} ]] ; then 314 if [[ -n ${cur_tok_a} ]] && [[ -z ${cur_tok_a//[[:digit:]]} ]] ; then
279 cur_idx_a=$(( ${cur_idx_a} + 1 )) 315 cur_idx_a+=1
280 [[ ${parts_a[${cur_idx_a}]} == "." ]] \ 316 [[ ${parts_a[cur_idx_a]} == . ]] \
281 && cur_idx_a=$(( ${cur_idx_a} + 1 )) 317 && cur_idx_a+=1
282 else 318 else
283 cur_tok_a="" 319 cur_tok_a=
284 fi 320 fi
285 321
286 if [[ -n ${cur_tok_b} ]] && [[ -z ${cur_tok_b//[[:digit:]]} ]] ; then 322 if [[ -n ${cur_tok_b} ]] && [[ -z ${cur_tok_b//[[:digit:]]} ]] ; then
287 cur_idx_b=$(( ${cur_idx_b} + 1 )) 323 cur_idx_b+=1
288 [[ ${parts_b[${cur_idx_b}]} == "." ]] \ 324 [[ ${parts_b[cur_idx_b]} == . ]] \
289 && cur_idx_b=$(( ${cur_idx_b} + 1 )) 325 && cur_idx_b+=1
290 else 326 else
291 cur_tok_b="" 327 cur_tok_b=
292 fi 328 fi
293 329
294 # done with number components? 330 # done with number components?
295 [[ -z ${cur_tok_a} ]] && [[ -z ${cur_tok_b} ]] && break 331 [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]] && break
296 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
297 # to avoid going into octal mode, strip any leading zeros. otherwise 351 # to avoid going into octal mode, strip any leading zeros. otherwise
298 # 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.
299 cur_tok_a=${cur_tok_a##+(0)} 353 cur_tok_a=${cur_tok_a##+(0)}
300 cur_tok_b=${cur_tok_b##+(0)} 354 cur_tok_b=${cur_tok_b##+(0)}
301 355
302 # if a component is blank, make it zero. 356 # now if a component is blank, it was originally 0 -- make it so
303 [[ -z ${cur_tok_a} ]] && cur_tok_a=0 357 : ${cur_tok_a:=0}
304 [[ -z ${cur_tok_b} ]] && cur_tok_b=0 358 : ${cur_tok_b:=0}
305 359
306 # compare 360 # compare
307 [[ ${cur_tok_a} -lt ${cur_tok_b} ]] && return 1 361 ((cur_tok_a < cur_tok_b)) && eshopts_pop && return 1
308 [[ ${cur_tok_a} -gt ${cur_tok_b} ]] && return 3 362 ((cur_tok_a > cur_tok_b)) && eshopts_pop && return 3
363 fi
309 done 364 done
310 365
311 ### number parts equal. compare letter parts. 366 ### number parts equal. compare letter parts.
312 local letter_a= 367 local letter_a=
313 letter_a=${parts_a[${cur_idx_a}]} 368 letter_a=${parts_a[cur_idx_a]}
314 if [[ ${#letter_a} -eq 1 ]] && [[ -z ${letter_a/[a-z]} ]] ; then 369 if [[ ${#letter_a} -eq 1 && -z ${letter_a/[a-z]} ]] ; then
315 cur_idx_a=$(( ${cur_idx_a} + 1 )) 370 cur_idx_a+=1
316 else 371 else
317 letter_a="@" 372 letter_a=@
318 fi 373 fi
319 374
320 local letter_b= 375 local letter_b=
321 letter_b=${parts_b[${cur_idx_b}]} 376 letter_b=${parts_b[cur_idx_b]}
322 if [[ ${#letter_b} -eq 1 ]] && [[ -z ${letter_b/[a-z]} ]] ; then 377 if [[ ${#letter_b} -eq 1 && -z ${letter_b/[a-z]} ]] ; then
323 cur_idx_b=$(( ${cur_idx_b} + 1 )) 378 cur_idx_b+=1
324 else 379 else
325 letter_b="@" 380 letter_b=@
326 fi 381 fi
327 382
328 # compare 383 # compare
329 [[ ${letter_a} < ${letter_b} ]] && return 1 384 [[ ${letter_a} < ${letter_b} ]] && eshopts_pop && return 1
330 [[ ${letter_a} > ${letter_b} ]] && return 3 385 [[ ${letter_a} > ${letter_b} ]] && eshopts_pop && return 3
331 386
332 ### letter parts equal. compare suffixes in order. 387 ### letter parts equal. compare suffixes in order.
333 local suffix rule part r_lt r_gt 388 inf_loop=0
334 for rule in "alpha=1" "beta=1" "pre=1" "rc=1" "p=3" "r=3" ; do 389 while true ; do
335 suffix=${rule%%=*} 390 inf_loop+=1
336 r_lt=${rule##*=} 391 ((inf_loop > 20)) && \
337 [[ ${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++))
338 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
339 local suffix_a= 424 local suffix
340 for part in ${parts_a[@]} ; do 425 for suffix in alpha beta pre rc "" p; do
341 [[ ${part#${suffix}} != ${part} ]] && \ 426 [[ ${cur_tok_a} == ${suffix} ]] && eshopts_pop && return 1
342 [[ -z ${part##${suffix}*([[:digit:]])} ]] && \ 427 [[ ${cur_tok_b} == ${suffix} ]] && eshopts_pop && return 3
343 suffix_a=${part#${suffix}}0
344 done 428 done
345 429 elif [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]]; then
346 local suffix_b= 430 break
347 for part in ${parts_b[@]} ; do 431 else
348 [[ ${part#${suffix}} != ${part} ]] && \ 432 ((num_part_a < num_part_b)) && eshopts_pop && return 1
349 [[ -z ${part##${suffix}*([[:digit:]])} ]] && \ 433 ((num_part_a > num_part_b)) && eshopts_pop && return 3
350 suffix_b=${part#${suffix}}0 434 fi
351 done 435 done
352 436
353 [[ -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++))
354 440
355 [[ -z ${suffix_a} ]] && return ${r_gt} 441 # Sanity check
356 [[ -z ${suffix_b} ]] && 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
357 445
358 # avoid octal problems 446 num_part_a=${parts_a[cur_idx_a]#r}
359 suffix_a=${suffix_a##+(0)} ; suffix_a=${suffix_a:-0} 447 num_part_a=${num_part_a##+(0)}
360 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}
361 452
362 [[ ${suffix_a} -lt ${suffix_b} ]] && return 1 453 ((num_part_a < num_part_b)) && eshopts_pop && return 1
363 [[ ${suffix_a} -gt ${suffix_b} ]] && return 3 454 ((num_part_a > num_part_b)) && eshopts_pop && return 3
364 done
365 455
366 ### no differences. 456 ### no differences.
457 eshopts_pop
367 return 2 458 return 2
368} 459}
369 460
461# @FUNCTION: version_sort
462# @USAGE: <version> [more versions...]
463# @DESCRIPTION:
370# 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
371# 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.
372# Uses version_compare, so be careful. 466# Uses version_compare, so be careful.
373version_sort() { 467version_sort() {
468 eshopts_push -s extglob
469 local items=
374 local items= left=0 470 local -i left=0
375 items=( $@ ) 471 items=("$@")
376 while [[ ${left} -lt ${#items[@]} ]] ; do 472 while ((left < ${#items[@]})); do
377 local lowest_idx=${left} 473 local -i lowest_idx=left
378 local idx=$(( ${lowest_idx} + 1 )) 474 local -i idx=lowest_idx+1
379 while [[ ${idx} -lt ${#items[@]} ]] ; do 475 while ((idx < ${#items[@]})); do
380 version_compare "${items[${lowest_idx}]}" "${items[${idx}]}" 476 version_compare "${items[lowest_idx]}" "${items[idx]}"
381 [[ $? -eq 3 ]] && lowest_idx=${idx} 477 [[ $? -eq 3 ]] && lowest_idx=idx
382 idx=$(( ${idx} + 1 )) 478 idx+=1
383 done 479 done
384 local tmp=${items[${lowest_idx}]} 480 local tmp=${items[lowest_idx]}
385 items[${lowest_idx}]=${items[${left}]} 481 items[lowest_idx]=${items[left]}
386 items[${left}]=${tmp} 482 items[left]=${tmp}
387 left=$(( ${left} + 1 )) 483 left+=1
388 done 484 done
389 echo ${items[@]} 485 echo ${items[@]}
486 eshopts_pop
487}
488
489# @FUNCTION: version_format_string
490# @USAGE: <format> [version]
491# @DESCRIPTION:
492# Reformat complicated version strings. The first argument is the string
493# to reformat with while the rest of the args are passed on to the
494# get_version_components function. You should make sure to single quote
495# the first argument since it'll have variables that get delayed expansions.
496# @EXAMPLE:
497# P="cow-hat-1.2.3_p4"
498# MY_P=$(version_format_string '${PN}_source_$1_$2-$3_$4')
499# Now MY_P will be: cow-hat_source_1_2-3_p4
500version_format_string() {
501 local fstr=$1
502 shift
503 set -- $(get_version_components "$@")
504 eval echo "${fstr}"
390} 505}
391 506
392__versionator__test_version_compare() { 507__versionator__test_version_compare() {
508 eshopts_push -s extglob
393 local lt=1 eq=2 gt=3 p q 509 local lt=1 eq=2 gt=3 p q
394 510
395 __versionator__test_version_compare_t() { 511 __versionator__test_version_compare_t() {
396 version_compare "${1}" "${3}" 512 version_compare "${1}" "${3}"
397 local r=$? 513 local r=$?
425 2.1 $gt 1.2 541 2.1 $gt 1.2
426 542
427 1.2.3 $lt 1.2.4 543 1.2.3 $lt 1.2.4
428 1.2.4 $gt 1.2.3 544 1.2.4 $gt 1.2.3
429 545
430 1.2.0 $eq 1.2 546 1.2.0 $gt 1.2
431 1.2.1 $gt 1.2 547 1.2.1 $gt 1.2
432 1.2 $lt 1.2.1 548 1.2 $lt 1.2.1
433 549
434 1.2b $eq 1.2b 550 1.2b $eq 1.2b
435 1.2b $lt 1.2c 551 1.2b $lt 1.2c
449 1.0_p1-r1 $gt 1.0_p1 565 1.0_p1-r1 $gt 1.0_p1
450 566
451 1.0_alpha6-r1 $gt 1.0_alpha6 567 1.0_alpha6-r1 $gt 1.0_alpha6
452 1.0_beta6-r1 $gt 1.0_alpha6-r2 568 1.0_beta6-r1 $gt 1.0_alpha6-r2
453 569
454 1.0_pre1 $lt 1.0-p1 570 1.0_pre1 $lt 1.0_p1
455 571
456 1.0p $gt 1.0_p1 572 1.0p $gt 1.0_p1
457 1.0r $gt 1.0-r1 573 1.0r $gt 1.0-r1
458 1.6.15 $gt 1.6.10-r2 574 1.6.15 $gt 1.6.10-r2
459 1.6.10-r2 $lt 1.6.15 575 1.6.10-r2 $lt 1.6.15
462 [[ -z "${a}${b}${c}" ]] && continue; 578 [[ -z "${a}${b}${c}" ]] && continue;
463 __versionator__test_version_compare_t "${a}" "${b}" "${c}" 579 __versionator__test_version_compare_t "${a}" "${b}" "${c}"
464 done 580 done
465 581
466 582
467 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
468 for p in ${q%%=*} ; do 584 for p in ${q%%=*} ; do
469 local c=${q##*=} 585 local c=${q##*=}
470 local alt=${c%%;*} agt=${c##*;} 586 local alt=${c%%;*} agt=${c##*;}
471 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}" 587 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}"
472 __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"
482 598
483 __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"
484 __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"
485 __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"
486 __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"
487 done 611 done
488 done 612 done
489 613
490 for p in "-r" "_p" ; do 614 for p in "-r" "_p" ; do
491 __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"
492 __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"
493 __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"
494 __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"
495 done 619 done
496 620
497} 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"
498 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
693 eshopts_pop
694}

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

  ViewVC Help
Powered by ViewVC 1.1.20