Skip to content

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

fix APTCONF using (discussed with Vitaly Ostanin)

parent ae96e9c3
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
etc/config
View file @ 06be9b92
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
# You can uncomment it: # You can uncomment it:
#DEFAULTARCH=i586 #DEFAULTARCH=i586
#RPMDIR=$HOME/RPM #RPMDIR=$HOME/RPM
#APTCONF=/etc/apt/apt.conf # Use this config
#APTCONFBASE=/etc/apt/apt.conf
#REMOTERPMDIR="~/RPM" #REMOTERPMDIR="~/RPM"
# , # ,
......
share/eterbuild/functions/config
View file @ 06be9b92
...@@ -16,7 +16,7 @@ OURTMPDIR=$TMPDIR ...@@ -16,7 +16,7 @@ OURTMPDIR=$TMPDIR
[ -z "$OURTMPDIR" ] || [ -d "$OURTMPDIR" ] || OURTMPDIR=/tmp [ -z "$OURTMPDIR" ] || [ -d "$OURTMPDIR" ] || OURTMPDIR=/tmp
# It can be overrides in config # It can be overrides in config
DEFAULTARCH=i586 [ -n "$DEFAULTARCH" ] || DEFAULTARCH=i586
[ `uname -m` = "x86_64" ] && DEFAULTARCH=`uname -m` [ `uname -m` = "x86_64" ] && DEFAULTARCH=`uname -m`
NICE="nice" NICE="nice"
RPMBUILD=rpmbuild RPMBUILD=rpmbuild
...@@ -34,8 +34,7 @@ is_git() ...@@ -34,8 +34,7 @@ is_git()
RPMDIR="$HOME/RPM" RPMDIR="$HOME/RPM"
# apt.conf.SS is exists by default [ -n "$APTCONFBASE" ] || APTCONFBASE=$ETERBUILDETC/apt/apt.conf
[ -n "$APTCONF" ] || APTCONF=$ETERBUILDETC/apt/apt.conf.SS
#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