Skip to content

E
etersoft-build-utils
Commit 43140b43 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

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

parent 445fe1b2
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
bin/loginhsh
View file @ 43140b43
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
. $ETERBUILDDIR/functions/hasher load_mod hasher
SAVEOPT=$@ SAVEOPT=$@
......
bin/rpmbb
View file @ 43140b43
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
. $ETERBUILDDIR/functions/rpm load_mod rpm
# Start as helper # Start as helper
if [ "$1" = "--helper" ]; then if [ "$1" = "--helper" ]; then
......
bin/rpmbph
View file @ 43140b43
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
. $ETERBUILDDIR/functions/repl load_mod repl
#VENDORVERSION=`distr_vendor -e` #VENDORVERSION=`distr_vendor -e`
DISTRVERSION=`distr_vendor -v` DISTRVERSION=`distr_vendor -v`
......
bin/rpmbs
View file @ 43140b43
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
. $ETERBUILDDIR/functions/rpm load_mod rpm
SIGN= SIGN=
UPLOADNOW= UPLOADNOW=
......
bin/rpmbsh
View file @ 43140b43
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
. $ETERBUILDDIR/functions/rpm load_mod rpm
RESULT=0 RESULT=0
REMCOM= REMCOM=
......
bin/rpmcs
View file @ 43140b43
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
. load_mod rpm load_mod rpm repl spec
. load_mod repl
. load_mod spec
dummy_spec() dummy_spec()
{ {
......
bin/rpmgp
View file @ 43140b43
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
load_mod rpm load_mod rpm repl
load_mod repl
# path to ALT Linux's repositories # path to ALT Linux's repositories
REPOSITORY="files/SRPMS obsolete orphaned" REPOSITORY="files/SRPMS obsolete orphaned"
......
bin/rpmgs
View file @ 43140b43
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
. $ETERBUILDDIR/functions/rpm load_mod rpm
WEXT="" WEXT=""
GETSOURCE="" GETSOURCE=""
......
share/eterbuild/functions/common
View file @ 43140b43
...@@ -14,7 +14,8 @@ set_eterbuilddir() ...@@ -14,7 +14,8 @@ set_eterbuilddir()
# if run from no system installation # if run from no system installation
ETERBUILDDIR=$(realpath `dirname $0`/../share/eterbuild) ETERBUILDDIR=$(realpath `dirname $0`/../share/eterbuild)
ETERBUILDETC=$(realpath `dirname $0`/../etc) 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" echo "Note: run from source tree, datadir=$ETERBUILDDIR, sysconfdir=$ETERBUILDETC"
else else
ETERBUILDETC=/etc/eterbuild ETERBUILDETC=/etc/eterbuild
...@@ -200,5 +201,8 @@ add_changelog_helper() ...@@ -200,5 +201,8 @@ add_changelog_helper()
load_mod() load_mod()
{ {
. $ETERBUILDDIR/functions/$1 local i
for i in $@ ; do
. $ETERBUILDDIR/functions/$i
done
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment