1
0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-11-18 21:14:11 +01:00

12582: improved first argument for is-at-least

This commit is contained in:
Peter Stephenson 2000-08-10 16:53:00 +00:00
parent f6ecbb7f4d
commit 432c0af097
2 changed files with 14 additions and 6 deletions

@ -1,5 +1,9 @@
2000-08-10 Peter Stephenson <pws@csr.com>
* 12582: Misc/Functions/is-at-least: make it accept name
parts in the first argument (though I forgot to handle things
like 3.1.6.random3 with no separator).
* 12581: Doc/Zsh/options.yo, Src/options.c, Src/params.c,
Src/zsh.h: Add C_BASES option to output hexadecimal as 0xFF
instead of 16#FF, and similarly for octal if OCTAL_ZEROES is set.

@ -12,6 +12,7 @@
# is-at-least 3.1.6-15 && setopt NO_GLOBAL_RCS
# is-at-least 3.1.0 && setopt HIST_REDUCE_BLANKS
# is-at-least 586 $MACHTYPE && echo 'You could be running Mandrake!'
# is-at-least $ZSH_VERSION || print 'Something fishy here.'
function is-at-least()
{
@ -19,14 +20,17 @@ function is-at-least()
local IFS=".-" min_cnt=0 ver_cnt=0 part min_ver version
min_ver=(${=1})
version=(${=2:-$ZSH_VERSION} 0)
while (( $min_cnt <= ${#min_ver} )) {
while [[ "$part" != <-> ]] {
[[ $[++ver_cnt] > ${#version} ]] && return 0
while (( $min_cnt <= ${#min_ver} )); do
while [[ "$part" != <-> ]]; do
(( ++ver_cnt > ${#version} )) && return 0
part=${version[ver_cnt]##*[^0-9]}
}
[[ $[++min_cnt] > ${#min_ver} ]] && return 0
done
while true; do
(( ++min_cnt > ${#min_ver} )) && return 0
[[ ${min_ver[min_cnt]} = <-> ]] && break
done
(( part > min_ver[min_cnt] )) && return 0
(( part < min_ver[min_cnt] )) && return 1
part=''
}
done
}