diff --git a/CHANGES.txt b/CHANGES.txt index c13c97f..41dadf4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +## Version 2.12.1 du 24/08/2015-16:12 + +e356c2b bug avec le calcul du système +e040cac Avec les fonctions e*, afficher le statut de façon explicite en mode non coloré + ## Version 2.12.0 du 23/08/2015-22:57 dcb85ac Améliorer le déploiement uinst:rsync avec préfixes pour les hôtes distants diff --git a/VERSION.txt b/VERSION.txt index d8b6989..3cf561c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -2.12.0 +2.12.1 diff --git a/lib/ulib/base b/lib/ulib/base index a1a2c92..ae4844f 100644 --- a/lib/ulib/base +++ b/lib/ulib/base @@ -2966,9 +2966,9 @@ function __indent() { fi } # fonctions à surcharger pour modifier la façon dont les messages sont affichés -function __eerror() { tooenc "$(__edate)${__tlevel}E $(__indent "$1")"; } -function __ewarn() { tooenc "$(__edate)${__tlevel}W $(__indent "$1")"; } -function __enote() { tooenc "$(__edate)${__tlevel}N $(__indent "$1")"; } +function __eerror() { tooenc "$(__edate)${__tlevel}ERROR $(__indent "$1")"; } +function __ewarn() { tooenc "$(__edate)${__tlevel}WARNING $(__indent "$1")"; } +function __enote() { tooenc "$(__edate)${__tlevel}NOTE $(__indent "$1")"; } function __ebanner() { local maxi="${COLUMNS:-80}" local -a lines @@ -2990,12 +2990,12 @@ function __ebanner() { done tooenc "$psfix" } -function __eimportant() { tooenc "$(__edate)${__tlevel}! $(__indent "$1")"; } -function __eattention() { tooenc "$(__edate)${__tlevel}* $(__indent "$1")"; } -function __einfo() { tooenc "$(__edate)${__tlevel}I $(__indent "$1")"; } +function __eimportant() { tooenc "$(__edate)${__tlevel}IMPORTANT $(__indent "$1")"; } +function __eattention() { tooenc "$(__edate)${__tlevel}ATTENTION $(__indent "$1")"; } +function __einfo() { tooenc "$(__edate)${__tlevel}INFO $(__indent "$1")"; } function __eecho() { tooenc "$(__edate)${__tlevel}$(__indent "$1")"; } function __eecho_() { tooenc_ "$(__edate)${__tlevel}$(__indent "$1")"; } -function __edebug() { tooenc "$(__edate)${__tlevel}D $(__indent "$1")"; } +function __edebug() { tooenc "$(__edate)${__tlevel}DEBUG $(__indent "$1")"; } function __estep() { tooenc "$(__edate)${__tlevel}. $(__indent "$1")"; } function __estepe() { __estep "$@"; } function __estepw() { __estep "$@"; } @@ -3006,7 +3006,7 @@ function __estepe_() { __estep_ "$@"; } function __estepw_() { __estep_ "$@"; } function __estepn_() { __estep_ "$@"; } function __estepi_() { __estep_ "$@"; } -function __etitle() { tooenc "$(__edate)${__tlevel}T $(__indent "$1")"; } +function __etitle() { tooenc "$(__edate)${__tlevel}=== $(__indent "$1")"; } function __ebegin() { tooenc_ "$(__edate)${__tlevel}. $(__indent "$1"): "; } function __edoto() { echo_ "."; } function __edotw() { echo_ "w"; } diff --git a/lib/ulib/sysinfos b/lib/ulib/sysinfos index 7303798..1362ece 100644 --- a/lib/ulib/sysinfos +++ b/lib/ulib/sysinfos @@ -382,10 +382,8 @@ function check_sysinfos() { if array_contains "$sysdistvar_" "$sysdist_"; then r_=0 check_=skip - break + [ "$sysdist_" == "$value_" ] && break elif [ "$sysdist_" == "$value_" ]; then - r_=0 - check_=skip break fi done @@ -424,10 +422,8 @@ function check_sysinfos() { if array_contains "$sysvervar_" "$sysver_"; then r_=0 check_=skip - break + [ "$sysver_" == "$value_" ] && break elif [ "$sysver_" == "$value_" ]; then - r_=0 - check_=skip break fi done