Commit 5a2d57c4 authored by Vitaly Lipatov's avatar Vitaly Lipatov

introduce and use ETERBUILDETC = /etc/eterbuild

parent 4aed9f19
...@@ -24,7 +24,7 @@ load_systems_list() ...@@ -24,7 +24,7 @@ load_systems_list()
#FTP[$IDX]=${line/.* \+/} #FTP[$IDX]=${line/.* \+/}
SYSURL[$IDX]=$(echo $line | sed -e "s|.* \+||g") SYSURL[$IDX]=$(echo $line | sed -e "s|.* \+||g")
IDX=$(($IDX+1)) IDX=$(($IDX+1))
done < $ETERBUILDDIR/repos done < $ETERBUILDETC/repos
} }
list_systems() list_systems()
......
...@@ -76,7 +76,7 @@ TESTINGAPTCONF=$OURTMPDIR/apt.conf ...@@ -76,7 +76,7 @@ TESTINGAPTCONF=$OURTMPDIR/apt.conf
# Hack: subst patch to sources.list # Hack: subst patch to sources.list
cat $ORDINALAPTCONF | \ cat $ORDINALAPTCONF | \
sed -e "s|\"/etc/apt/.*\"|\"$OURTMPDIR/sources.list\"|g" >$TESTINGAPTCONF sed -e "s|\"/etc/apt/.*\"|\"$OURTMPDIR/sources.list\"|g" >$TESTINGAPTCONF
cat /etc/apt/sources.list.$MENV >$OURTMPDIR/sources.list || fatal "" cat $ETERBUILDETC/apt/sources.list.$MENV >$OURTMPDIR/sources.list || fatal ""
HASHERDIR=$HASHERDIR$MENVARG HASHERDIR=$HASHERDIR$MENVARG
if [ ! -d $HASHERDIR/repo ] || [ -n "$SKIPTST" ] ; then if [ ! -d $HASHERDIR/repo ] || [ -n "$SKIPTST" ] ; then
......
...@@ -21,6 +21,7 @@ export TEXTDOMAIN ...@@ -21,6 +21,7 @@ export TEXTDOMAIN
TEXTDOMAINDIR='/usr/share/locale' TEXTDOMAINDIR='/usr/share/locale'
export TEXTDOMAINDIR export TEXTDOMAINDIR
ETERBUILDDIR=/usr/share/eterbuild ETERBUILDDIR=/usr/share/eterbuild
ETERBUILDETC=/etc/eterbuild
echog() echog()
{ {
...@@ -135,7 +136,7 @@ uni_rpmbuild() ...@@ -135,7 +136,7 @@ uni_rpmbuild()
} }
RPMDIR="$HOME/RPM" RPMDIR="$HOME/RPM"
[ -n "$APTCONF" ] || APTCONF=/etc/eterbuild/apt/apt.conf [ -n "$APTCONF" ] || APTCONF=$ETERBUILDETC/apt/apt.conf
#OWNERMAIL=`grep "^%packager" ~/.rpmmacros | head -n 1 | sed -e "s/%packager[ \t]*//g"` #OWNERMAIL=`grep "^%packager" ~/.rpmmacros | head -n 1 | sed -e "s/%packager[ \t]*//g"`
OWNERMAIL=`rpm --eval %packager` OWNERMAIL=`rpm --eval %packager`
......
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