X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-rpm-build%2Fupload-rpms.sh;h=bc4e6c7b55be33a89328b05e314dde06584b0e96;hb=46340c8a878d4a45eb3296c9a47f8d43110d7d78;hp=b535e0d227bdf9c295c0db32236ecf4cef421972;hpb=25a22cb63f6ca4969a4291eec68387cec9529980;p=git-tools-moved-to-github.git

diff --git a/id-rpm-build/upload-rpms.sh b/id-rpm-build/upload-rpms.sh
index b535e0d..bc4e6c7 100755
--- a/id-rpm-build/upload-rpms.sh
+++ b/id-rpm-build/upload-rpms.sh
@@ -1,9 +1,9 @@
+#!/bin/sh
 PWD=`pwd`
 UPLOAD_PATH=${UPLOAD_PATH:=/home/ftp/pub}
-UPLOAD_HOST=${UPLOAD_HOST:=flurry}
-DISTRO=${DISTRO:="centos/5.5"}
+UPLOAD_HOST=${UPLOAD_HOST:=ftp.indexdata.dk}
 specfile=$1
-if test ! -f ${specfile}; then
+if test ! -f "${specfile}"; then
 	echo "Missing .spec file argument."
 	exit 1
 fi
@@ -11,9 +11,20 @@ if test ! -x /bin/rpm; then
         echo "$0: /bin/rpm missing. Install rpm"
         exit 1
 fi
+if test ! -f /etc/redhat-release; then
+	echo "/etc/redhat-release missing"
+	exit 1
+fi
+if test -z "$DISTRO"; then
+	if grep 'release 6' /etc/redhat-release >/dev/null; then
+		DISTRO="centos/6"
+	else
+		DISTRO="centos/5.5"
+	fi
+fi
 topdir=`rpm --eval "%{_topdir}"`
 BUILD_DIR=${BUILD_DIR:=${topdir}}
-pkg_names=`rpm -q --specfile ${specfile}`
+pkg_names=`rpm -q --specfile ${specfile} --queryformat "%{NAME}-%{VERSION}-%{RELEASE}\n"`
 pkg_short=`rpm -q --specfile ${specfile} --queryformat "%{NAME};" | cut -d ";" -f1`
 
 UPLOAD_DIR=${UPLOAD_DIR:=${pkg_short}}