From 8cd4f03cb4edee6758b5238b842a6eb397a23404 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Sat, 1 Dec 2012 17:40:21 +0100 Subject: [PATCH] libraries: get rid of the clashing variables 'me' Signed-off-by: Davide Madrisan --- ChangeLog | 4 ++++ lib/libapse.lib.in | 11 ++++++----- lib/libcfg.lib.in | 8 ++++---- lib/libmsgmng.lib.in | 5 ++--- lib/libnetwork.lib.in | 8 ++++---- lib/libspec.lib.in | 8 ++++---- lib/libtest.lib.in | 8 ++++---- lib/libtranslate.lib.in | 2 -- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a3f063..bca7060 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,10 @@ Changes in version 1.16.1 * config-getvar - Davide Madrisan: Update the help message. ++ bugfix + * lib/* - Davide Madrisan: + Get rid of the clashing variables 'me'. + ------------------------------------------------------------------------------- Changes in version 1.16.0 diff --git a/lib/libapse.lib.in b/lib/libapse.lib.in index 664e5bb..ad6f9e0 100644 --- a/lib/libapse.lib.in +++ b/lib/libapse.lib.in @@ -9,20 +9,21 @@ libapse_is_loaded=1 [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && echo $"this script requires bash version 2 or better" >&2 && exit 1 -me=("libapse.lib" "@version@" "@date@") - [ -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; } . @libdir@/libmsgmng.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; } . @libdir@/libspec.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; } . @libdir@/libtranslate.lib diff --git a/lib/libcfg.lib.in b/lib/libcfg.lib.in index ac66a08..699b69c 100644 --- a/lib/libcfg.lib.in +++ b/lib/libcfg.lib.in @@ -8,15 +8,15 @@ libcfg_is_loaded=1 [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && echo $"this script requires bash version 2 or better" >&2 && exit 1 -me=("libcfg.lib" "@version@" "@date@") - [ -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; } . @libdir@/libmsgmng.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; } . @libdir@/libtranslate.lib diff --git a/lib/libmsgmng.lib.in b/lib/libmsgmng.lib.in index 48c422d..ba1e17c 100644 --- a/lib/libmsgmng.lib.in +++ b/lib/libmsgmng.lib.in @@ -8,10 +8,9 @@ libmsgmng_is_loaded=1 [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && echo $"this script requires bash version 2 or better" >&2 && exit 1 -me=("libmsgmng.lib" "@version@" "@date@") - [ -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; } . @libdir@/libtranslate.lib diff --git a/lib/libnetwork.lib.in b/lib/libnetwork.lib.in index 6c73b6a..9637ac0 100644 --- a/lib/libnetwork.lib.in +++ b/lib/libnetwork.lib.in @@ -8,15 +8,15 @@ libnetwork_is_loaded=1 [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] && { echo $"this script requires bash version 3 or better" >&2 && exit 1; } -me=("libnetwork.lib" "@version@" "@date@") - [ -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; } . @libdir@/libmsgmng.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; } . @libdir@/libtranslate.lib diff --git a/lib/libspec.lib.in b/lib/libspec.lib.in index bc7c1b8..72ca505 100644 --- a/lib/libspec.lib.in +++ b/lib/libspec.lib.in @@ -8,15 +8,15 @@ libspec_is_loaded=1 [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && echo $"this script requires bash version 2 or better" >&2 && exit 1 -me=("libspec.lib" "@version@" "@date@") - [ -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; } . @libdir@/libmsgmng.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; } . @libdir@/libtranslate.lib diff --git a/lib/libtest.lib.in b/lib/libtest.lib.in index 305035e..2d1b3ac 100644 --- a/lib/libtest.lib.in +++ b/lib/libtest.lib.in @@ -8,15 +8,15 @@ libtest_is_loaded=1 [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] && { echo $"this script requires bash version 3 or better" >&2 && exit 1; } -me=("libtest.lib" "@version@" "@date@") - [ -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; } . @libdir@/libmsgmng.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; } . @libdir@/libtranslate.lib diff --git a/lib/libtranslate.lib.in b/lib/libtranslate.lib.in index 522095b..6322928 100644 --- a/lib/libtranslate.lib.in +++ b/lib/libtranslate.lib.in @@ -8,8 +8,6 @@ libtest_is_loaded=1 [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && { 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 . /etc/sysconfig/i18n [ "$LANG" ] && export LANG