From d19d14a03103d32059598d292defb77945309f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Mon, 15 Dec 2014 23:38:06 +0100
Subject: RPM packaging: update for R14

---
 redhat/build/get_latest_tarball_filename.sh | 47 +++++++++++++++++++----------
 1 file changed, 31 insertions(+), 16 deletions(-)

(limited to 'redhat/build/get_latest_tarball_filename.sh')

diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh
index 3cdeb904d..0e1d6ebdc 100755
--- a/redhat/build/get_latest_tarball_filename.sh
+++ b/redhat/build/get_latest_tarball_filename.sh
@@ -6,22 +6,37 @@ TDE_VERSION="${2:-14.0.0}"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tde-tarballs/${TDE_VERSION}/
 [ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging
-[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat/
+[ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat/
+
+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)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
 
 RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -n | tail -n 1)
-if [ -z "${RET}" ]; then
-  RET=$(find "${TARBALLS_DIR}/../extras/" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1)
-fi
-if [ ! -r "${RET}" ]; then
-	# Retry without 'trinity-*', and allow any TAR extension.
-	RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
-	if [ ! -r "${RET}" ]; then
-		# Retry by removing numbers in package name, e.g "imlib1" => "imlib"
-		RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -n | tail -n 1)
-	fi
-fi
-
-[ -z "${RET}" ] && exit 2
-
-echo "${RET}"
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+RET=$(find "${EXTRA_DIR}" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+# Now look in the 'tde-packaging' directory
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+# Retry without 'trinity-*', and allow any TAR extension.
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+# Retry without 'trinity-*', and allow any TAR extension.
+RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+# Retry by removing numbers in package name, e.g "imlib1" => "imlib"
+RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -n | tail -n 1)
+[ -r "${RET}" ] && echo "${RET}" && exit 0
+
+
 exit 0
-- 
cgit v1.2.3