libraries: get rid of the clashing variables 'me'

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-12-01 17:40:21 +01:00
parent 88ce40667b
commit 8cd4f03cb4
8 changed files with 28 additions and 26 deletions

View File

@ -27,6 +27,10 @@ Changes in version 1.16.1
* config-getvar - Davide Madrisan: * config-getvar - Davide Madrisan:
Update the help message. Update the help message.
+ bugfix
* lib/* - Davide Madrisan:
Get rid of the clashing variables 'me'.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Changes in version 1.16.0 Changes in version 1.16.0

View File

@ -9,20 +9,21 @@ libapse_is_loaded=1
[ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] &&
echo $"this script requires bash version 2 or better" >&2 && exit 1 echo $"this script requires bash version 2 or better" >&2 && exit 1
me=("libapse.lib" "@version@" "@date@")
[ -r @libdir@/libmsgmng.lib ] || [ -r @libdir@/libmsgmng.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2 { echo "\
libapse.lib: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libmsgmng.lib . @libdir@/libmsgmng.lib
[ -r @libdir@/libspec.lib ] || [ -r @libdir@/libspec.lib ] ||
{ echo "$me: "$"library not found"": /usr/share/autospec/lib/libspec.lib" 1>&2 { echo "\
libapse.lib: "$"library not found"": /usr/share/autospec/lib/libspec.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libspec.lib . @libdir@/libspec.lib
[ -r @libdir@/libtranslate.lib ] || [ -r @libdir@/libtranslate.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libtranslate.lib" 1>&2 { echo "\
libapse.lib: "$"library not found"": @libdir@/libtranslate.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libtranslate.lib . @libdir@/libtranslate.lib

View File

@ -8,15 +8,15 @@ libcfg_is_loaded=1
[ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] &&
echo $"this script requires bash version 2 or better" >&2 && exit 1 echo $"this script requires bash version 2 or better" >&2 && exit 1
me=("libcfg.lib" "@version@" "@date@")
[ -r @libdir@/libmsgmng.lib ] || [ -r @libdir@/libmsgmng.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2 { echo "\
libcfg.lib: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libmsgmng.lib . @libdir@/libmsgmng.lib
[ -r @libdir@/libtranslate.lib ] || [ -r @libdir@/libtranslate.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libtranslate.lib" 1>&2 { echo "\
libcfg.lib: "$"library not found"": @libdir@/libtranslate.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libtranslate.lib . @libdir@/libtranslate.lib

View File

@ -8,10 +8,9 @@ libmsgmng_is_loaded=1
[ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] &&
echo $"this script requires bash version 2 or better" >&2 && exit 1 echo $"this script requires bash version 2 or better" >&2 && exit 1
me=("libmsgmng.lib" "@version@" "@date@")
[ -r @libdir@/libtranslate.lib ] || [ -r @libdir@/libtranslate.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libtranslate.lib" 1>&2 { echo "\
libmsgmng.lib: "$"library not found"": @libdir@/libtranslate.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libtranslate.lib . @libdir@/libtranslate.lib

View File

@ -8,15 +8,15 @@ libnetwork_is_loaded=1
[ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] && [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] &&
{ echo $"this script requires bash version 3 or better" >&2 && exit 1; } { echo $"this script requires bash version 3 or better" >&2 && exit 1; }
me=("libnetwork.lib" "@version@" "@date@")
[ -r @libdir@/libmsgmng.lib ] || [ -r @libdir@/libmsgmng.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2 { echo "\
libnetwork.lib: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libmsgmng.lib . @libdir@/libmsgmng.lib
[ -r @libdir@/libtranslate.lib ] || [ -r @libdir@/libtranslate.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libtranslate.lib" 1>&2 { echo "\
libnetwork.lib: "$"library not found"": @libdir@/libtranslate.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libtranslate.lib . @libdir@/libtranslate.lib

View File

@ -8,15 +8,15 @@ libspec_is_loaded=1
[ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] &&
echo $"this script requires bash version 2 or better" >&2 && exit 1 echo $"this script requires bash version 2 or better" >&2 && exit 1
me=("libspec.lib" "@version@" "@date@")
[ -r @libdir@/libmsgmng.lib ] || [ -r @libdir@/libmsgmng.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2 { echo "\
libspec.lib: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libmsgmng.lib . @libdir@/libmsgmng.lib
[ -r @libdir@/libtranslate.lib ] || [ -r @libdir@/libtranslate.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libtranslate.lib" 1>&2 { echo "\
libspec.lib: "$"library not found"": @libdir@/libtranslate.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libtranslate.lib . @libdir@/libtranslate.lib

View File

@ -8,15 +8,15 @@ libtest_is_loaded=1
[ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] && [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] &&
{ echo $"this script requires bash version 3 or better" >&2 && exit 1; } { echo $"this script requires bash version 3 or better" >&2 && exit 1; }
me=("libtest.lib" "@version@" "@date@")
[ -r @libdir@/libmsgmng.lib ] || [ -r @libdir@/libmsgmng.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2 { echo "\
libtest.lib: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libmsgmng.lib . @libdir@/libmsgmng.lib
[ -r @libdir@/libtranslate.lib ] || [ -r @libdir@/libtranslate.lib ] ||
{ echo "$me: "$"library not found"": @libdir@/libtranslate.lib" 1>&2 { echo "\
libtest.lib: "$"library not found"": @libdir@/libtranslate.lib" 1>&2
exit 1; } exit 1; }
. @libdir@/libtranslate.lib . @libdir@/libtranslate.lib

View File

@ -8,8 +8,6 @@ libtest_is_loaded=1
[ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] &&
{ echo $"this script requires bash version 2 or better" >&2 && exit 1; } { echo $"this script requires bash version 2 or better" >&2 && exit 1; }
me=("libtranslate.lib" "@version@" "@date@")
if [[ -z "$LANG" && -r /etc/sysconfig/i18n ]]; then if [[ -z "$LANG" && -r /etc/sysconfig/i18n ]]; then
. /etc/sysconfig/i18n . /etc/sysconfig/i18n
[ "$LANG" ] && export LANG [ "$LANG" ] && export LANG