Skip to content

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

всегда инициализируем DISTRVENDOR

parent 55c281b3
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
share/eterbuild/functions/common
View file @ cb89bdad
...@@ -19,8 +19,6 @@ set_eterbuilddir() ...@@ -19,8 +19,6 @@ set_eterbuilddir()
ATOPDIR=`dirname $0`/$TOPDIR ATOPDIR=`dirname $0`/$TOPDIR
ETERBUILDDIR=$(realpath $ATOPDIR/share/eterbuild) ETERBUILDDIR=$(realpath $ATOPDIR/share/eterbuild)
ETERBUILDETC=$(realpath $ATOPDIR/etc) ETERBUILDETC=$(realpath $ATOPDIR/etc)
DISTRVENDOR=$(realpath $ATOPDIR/../rpm-build-altlinux-compat/bin/distr_vendor 2>/dev/null)
[ -x "$DISTRVENDOR" ] || DISTRVENDOR=distr_vendor
if [ -r "$ETERBUILDETC/../AUTHORS" ] ; then if [ -r "$ETERBUILDETC/../AUTHORS" ] ; then
if [ -n "$VERBOSE" ] ; 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"
...@@ -42,6 +40,9 @@ if ! set_eterbuilddir ; then ...@@ -42,6 +40,9 @@ if ! set_eterbuilddir ; then
exit 1 exit 1
fi fi
DISTRVENDOR=$(realpath $ATOPDIR/../rpm-build-altlinux-compat/bin/distr_vendor 2>/dev/null)
[ -x "$DISTRVENDOR" ] || DISTRVENDOR=distr_vendor
# Выводит указанное сообщение об ошибке и завершает программу # Выводит указанное сообщение об ошибке и завершает программу
fatal() fatal()
{ {
......
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