From: Jakub Skoczen <jakub@indexdata.dk>
Date: Thu, 8 Jul 2010 14:51:31 +0000 (-0400)
Subject: Take the spec file as a parameter
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=0e5c8d165f908859733bd146d193b5c6125e7e7c;p=git-tools-moved-to-github.git

Take the spec file as a parameter

instead of looking for it in the pwd
---

diff --git a/id-rpm-build/upload-rpms.sh b/id-rpm-build/upload-rpms.sh
index 4f952f1..6cbe525 100755
--- a/id-rpm-build/upload-rpms.sh
+++ b/id-rpm-build/upload-rpms.sh
@@ -2,19 +2,22 @@ BUILD_DIR=${BUILD_DIR:=/usr/src/redhat/}
 PWD=`pwd`
 UPLOAD_PATH=${UPLOAD_PATH:=/home/ftp/pub}
 UPLOAD_HOST=${UPLOAD_HOST:=flurry}
-UPLOAD_DIR=${UPLOAD_DIR:=`basename $PWD`}
-UPLOAD_URI=${UPLOAD_HOST}:${UPLOAD_PATH}/${UPLOAD_DIR}
 DISTRO=${DISTRO:="centos/5.5"}
-project=`basename $PWD`
-if test ! -f ${project}.spec; then
-	echo "Missing ${project}.spec file. Are you in the project directory?"
+specfile=$1
+if test ! -f ${specfile}; then
+	echo "Missing .spec file argument."
 	exit 1
 fi
 if test ! -x /bin/rpm; then
         echo "$0: /bin/rpm missing. Install rpm"
         exit 1
 fi
-pkg_names=`rpm -q --specfile ${project}.spec`
+pkg_names=`rpm -q --specfile ${specfile}`
+pkg_short=`rpm -q --specfile ${specfile} --queryformat "%{NAME};" | cut -d ";" -f1`
+
+UPLOAD_DIR=${UPLOAD_DIR:=${pkg_short}}
+UPLOAD_URI=${UPLOAD_HOST}:${UPLOAD_PATH}/${UPLOAD_DIR}
+echo "Uploading to ${UPLOAD_URI}..."
 inc_src=true
 if test ! -d ${BUILD_DIR}/SRPMS; then 
 	echo "No SRPMS dir under ${BUILD_DIR}"