allow load_mod to load several modules, update all scripts to use it

bin/loginhsh

@@ -12,7 +12,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
-. $ETERBUILDDIR/functions/hasher
+load_mod hasher
 
 SAVEOPT=$@
 

bin/rpmbb

@@ -13,7 +13,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
-. $ETERBUILDDIR/functions/rpm
+load_mod rpm
 
 # Start as helper
 if [ "$1" = "--helper" ]; then

bin/rpmbph

@@ -12,7 +12,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
-. $ETERBUILDDIR/functions/repl
+load_mod repl
 
 #VENDORVERSION=`distr_vendor -e`
 DISTRVERSION=`distr_vendor -v`

bin/rpmbs

@@ -18,7 +18,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
-. $ETERBUILDDIR/functions/rpm
+load_mod rpm
 
 SIGN=
 UPLOADNOW=

bin/rpmbsh

@@ -13,7 +13,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
-. $ETERBUILDDIR/functions/rpm
+load_mod rpm
 
 RESULT=0
 REMCOM=

bin/rpmcs

@@ -9,9 +9,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
-. load_mod rpm
-. load_mod repl
-. load_mod spec
+load_mod rpm repl spec
 
 dummy_spec()
 {

bin/rpmgp

@@ -11,8 +11,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
-load_mod rpm
-load_mod repl
+load_mod rpm repl
 
 # path to ALT Linux's repositories
 REPOSITORY="files/SRPMS obsolete orphaned"

bin/rpmgs

@@ -14,7 +14,7 @@
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common
-. $ETERBUILDDIR/functions/rpm
+load_mod rpm
 
 WEXT=""
 GETSOURCE=""

share/eterbuild/functions/common

@@ -14,7 +14,8 @@ set_eterbuilddir()
 		# if run from no system installation
 		ETERBUILDDIR=$(realpath `dirname $0`/../share/eterbuild)
 		ETERBUILDETC=$(realpath `dirname $0`/../etc)
-		if [ -r "$ETERBUILDETC/../AUTHORS" ] ; then
+		#if [ -r "$ETERBUILDETC/../AUTHORS" ] ; then
+		if [ -n "$VERBOSE" ] ; then
 			echo "Note: run from source tree, datadir=$ETERBUILDDIR, sysconfdir=$ETERBUILDETC"
 		else
 			ETERBUILDETC=/etc/eterbuild
@@ -200,5 +201,8 @@ add_changelog_helper()
 
 load_mod()
 {
-. $ETERBUILDDIR/functions/$1
+	local i
+	for i in $@ ; do
+		. $ETERBUILDDIR/functions/$i
+	done
 }