From 6ddde32ec4113ca2574a6d63f85b312db776a40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 22 Mar 2017 21:57:13 +0100 Subject: RPM packaging: update build script --- redhat/build/get_latest_tarball_filename.sh | 4 ++-- redhat/build/get_specfile.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'redhat/build') diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index 0e1d6ebdc..7901d0915 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -13,13 +13,13 @@ EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)" RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1) [ -r "${RET}" ] && echo "${RET}" && exit 0 -RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1) +RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -follow -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1) [ -r "${RET}" ] && echo "${RET}" && exit 0 RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -n | tail -n 1) [ -r "${RET}" ] && echo "${RET}" && exit 0 -RET=$(find "${EXTRA_DIR}" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1) +RET=$(find "${EXTRA_DIR}" -follow -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1) [ -r "${RET}" ] && echo "${RET}" && exit 0 # Now look in the 'tde-packaging' directory diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index fcc0b64c5..b7336ffcc 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -24,7 +24,7 @@ for filename in \ "trinity-${PKGNAME}-14.0.0.spec" \ "trinity-${PKGNAME}.spec" \ ; do - SPECFILE="$(find "${DIST_PACKAGING_DIR}" -name "${filename}")" + SPECFILE="$(find "${DIST_PACKAGING_DIR}" -follow -name "${filename}")" if [ -r "${SPECFILE}" ]; then echo "${SPECFILE}" exit 0 -- cgit v1.2.1