buildrpm.sh: don't use $HOME
This is news to me: I didn't know that some distros do not set $HOME. So use "~" instead, and only try to grep ~/.rpmmacros if it exists. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
Этот коммит содержится в:
родитель
678e314c0e
Коммит
6002a8bca5
6
contrib/dist/linux/buildrpm.sh
поставляемый
6
contrib/dist/linux/buildrpm.sh
поставляемый
@ -267,7 +267,11 @@ fi
|
|||||||
# Find where the top RPM-building directory is
|
# Find where the top RPM-building directory is
|
||||||
#
|
#
|
||||||
|
|
||||||
rpmtopdir=${rpmtopdir:-"`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"}
|
rpmtopdir=
|
||||||
|
file=~/.rpmmacros
|
||||||
|
if test -r $file; then
|
||||||
|
rpmtopdir=${rpmtopdir:-"`grep %_topdir $file | awk '{ print $2 }'`"}
|
||||||
|
fi
|
||||||
if test "$rpmtopdir" != ""; then
|
if test "$rpmtopdir" != ""; then
|
||||||
rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'"
|
rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'"
|
||||||
if test ! -d "$rpmtopdir"; then
|
if test ! -d "$rpmtopdir"; then
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user