X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-rpm-build%2Fupload-rpms.sh;h=ee83ce979c38bb38733c33477e0c0df589d8878f;hb=17d2816b97223b888f2b081004b4756a58c22ec4;hp=471d249427dc343577a53f6582647086c110bb59;hpb=4daa435a1c71f35a6ee193895c92bb975ac326be;p=git-tools-moved-to-github.git

diff --git a/id-rpm-build/upload-rpms.sh b/id-rpm-build/upload-rpms.sh
index 471d249..ee83ce9 100755
--- a/id-rpm-build/upload-rpms.sh
+++ b/id-rpm-build/upload-rpms.sh
@@ -1,20 +1,24 @@
-BUILD_DIR=/usr/src/redhat/
 PWD=`pwd`
-UPLOAD_PATH=/home/ftp/pub
-UPLOAD_HOST=flurry
-UPLOAD_DIR=`basename $PWD`
-UPLOAD_URI=${UPLOAD_HOST}:${UPLOAD_PATH}/${UPLOAD_DIR}
-DISTRO="centos/5.5"
-project=`basename $PWD`
-if test ! -f ${project}.spec; then
-	echo "Missing ${project}.spec file. Are you in the project directory?"
+UPLOAD_PATH=${UPLOAD_PATH:=/home/ftp/pub}
+UPLOAD_HOST=${UPLOAD_HOST:=ftp.indexdata.dk}
+DISTRO=${DISTRO:="centos/5.5"}
+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`
+topdir=`rpm --eval "%{_topdir}"`
+BUILD_DIR=${BUILD_DIR:=${topdir}}
+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}"