lib/libapsa.lib: coding style fixes

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-07-21 19:47:56 +02:00
parent 547b750aef
commit 616d130d55
2 changed files with 40 additions and 27 deletions

View File

@ -1,3 +1,11 @@
Changes in version 1.12.4
+ update
* lib/libapse.lib - Davide Madrisan:
Coding style fixes.
-------------------------------------------------------------------------------
Changes in version 1.12.3 Changes in version 1.12.3
Tue Jul 17 2012 Davide Madrisan <davide.madrisan(a)gmail.com> Tue Jul 17 2012 Davide Madrisan <davide.madrisan(a)gmail.com>

View File

@ -54,7 +54,8 @@ function apse.cmpversion() {
prealpha=(\ prealpha=(\
"prealpha" "nightlybuild" "development" "dev" ${vcs[*]}) "prealpha" "nightlybuild" "development" "dev" ${vcs[*]})
beta=(\ beta=(\
"beta" "preview" "pre" "prototype" "proto" "tp" "ctp" "ea" "test" "milestone") "beta" "preview" "pre" "prototype" "proto" "tp" "ctp" "ea" "test" \
"milestone")
rc=(\ rc=(\
"rc" "gm" "gamma") "rc" "gm" "gamma")
stable=(\ stable=(\
@ -62,13 +63,16 @@ function apse.cmpversion() {
precedence=(\ precedence=(\
"prealpha[*]" "alpha" "beta[*]" "rc[*]" "delta" "omega" "stable[*]") "prealpha[*]" "alpha" "beta[*]" "rc[*]" "delta" "omega" "stable[*]")
# TODO: if in both there is vcs compare, if only in one of them watch changelog or/and data # TODO: if in both there is vcs compare, if only in one of them watch
# changelog or/and data
version1=($(echo $1 | tr '[:punct:]' ' ' | \ version1=(\
$(echo $1 | tr '[:punct:]' ' ' | \
sed -e "s,\([a-zA-Z^ ]*\)\([0-9^ ]*\)\([a-zA-Z^ ]*\),\1 \2 \3,g")) sed -e "s,\([a-zA-Z^ ]*\)\([0-9^ ]*\)\([a-zA-Z^ ]*\),\1 \2 \3,g"))
notify.debug "$FUNCNAME: version1 = ${version1[*]}" notify.debug "$FUNCNAME: version1 = ${version1[*]}"
version2=($(echo $2 | tr '[:punct:]' ' ' | \ version2=(\
$(echo $2 | tr '[:punct:]' ' ' | \
sed -e "s,\([a-zA-Z^ ]*\)\([0-9^ ]*\)\([a-zA-Z^ ]*\),\1 \2 \3,g")) sed -e "s,\([a-zA-Z^ ]*\)\([0-9^ ]*\)\([a-zA-Z^ ]*\),\1 \2 \3,g"))
notify.debug "$FUNCNAME: version2 = ${version2[*]}" notify.debug "$FUNCNAME: version2 = ${version2[*]}"
@ -356,7 +360,8 @@ sed "s,%{?[A-Za-z0-9_]*:.*\(%[A-Za-z0-9_]*\)},\1,"`
done done
# remove archiver extension from rexexp to match changes # remove archiver extension from rexexp to match changes
local pcknameregexp=$(echo [^A-Za-z0-9._-]$spck | sed "\ local pcknameregexp=$(echo [^A-Za-z0-9._-]$spck | \
sed "\
s,\.gz$,\\\., s,\.gz$,\\\.,
s,\.tgz$,\\\., s,\.tgz$,\\\.,
s,\.bz2$,\\\., s,\.bz2$,\\\.,