Use ftp.indexdata.dk for upload (same as id-pbuild.sh)

[git-tools-moved-to-github.git] / id-rpm-build / upload-rpms.sh

diff --git a/id-rpm-build/upload-rpms.sh b/id-rpm-build/upload-rpms.sh
index 4f952f1..ee83ce9 100755 (executable)
--- a/id-rpm-build/upload-rpms.sh
+++ b/id-rpm-build/upload-rpms.sh
@@ -1,20 +1,24 @@
-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}
+UPLOAD_HOST=${UPLOAD_HOST:=ftp.indexdata.dk}
 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`
+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}"