From: Heikki Levanto <heikki@indexdata.dk>
Date: Thu, 4 Apr 2013 08:33:59 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=5ce1c920f72dfc16196a062981ed11404aa539d1;hp=38cdfdd76964c05c489fb1d3fddc55e71710a346;p=git-tools-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
---

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index 004f892..8985207 100755
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -55,7 +55,7 @@ while test $# -gt 0; do
 	-*)
 	    do_help=yes
 	    ;;
-    esac
+    esac 
     shift
 done
 
@@ -63,6 +63,12 @@ if test "$do_help" = "yes"; then
     usage 1 1>&2
 fi
 
+if test "$DEBIAN_DIST" -o "$UBUNTU_DIST"; then
+    debian=true
+else
+    debian=false
+fi
+
 D0=`dirname $0`
 ID_DEB_BUILD=`cd $D0; pwd`
 PBUILDROOT=${ID_DEB_BUILD}/id-pbuild-root.sh
@@ -80,69 +86,93 @@ fi
 if $upload; then
     :
 else
-    if test "${SUDO_USER}"; then
-	if test ! -d deb-src; then
+    if $debian; then
+	if test "${SUDO_USER}"; then
+	    if test ! -d deb-src; then
+		$MKDEBSRC
+	    fi
+	else
+	    if test -d deb-src; then
+		rm -f deb-src/*.gz
+		if test $? -ne 0; then
+		    echo "deb-src could not be removed. Remove deb-src manually"
+		    exit 1
+		fi
+	    fi
 	    $MKDEBSRC
 	fi
     else
-	if test -d deb-src; then
-	    rm -f deb-src/*.gz
-	    if test $? -ne 0; then
-		echo "deb-src could not be removed. Remove deb-src manually"
-		exit 1
-	    fi
-	fi
-	$MKDEBSRC
+	mkdir -p deb-src
     fi
 fi
+
 cd deb-src
 
-for f in *.dsc; do
-    if test -f "$f"; then
-	PKG=$f
+if $debian; then
+    for f in *.dsc; do
+	if test -f "$f"; then
+	    PKG=$f
+	fi
+    done
+    if test -z "$PKG"; then
+	echo "Specify .dsc file"
+	exit 1
+    fi
+    if test ! -e "$PKG"; then
+	echo "${PKG} does not exist"
+	exit 1
+    fi
+    if grep "Architecture: all" $PKG >/dev/null; then
+	USE_ARCHS=i386
+    else
+	USE_ARCHS=$ARCHS
     fi
-done
-if test -z "$PKG"; then
-    echo "Specify .dsc file"
-    exit 1
-fi
-if test ! -e "$PKG"; then
-    echo "${PKG} does not exist"
-    exit 1
 fi
+
 if test -z "$PRODUCT"; then
-    PRODUCT=`echo *.dsc|sed 's/_.*//g'`
+    PRODUCT=$NAME
 fi
-if grep "Architecture: all" $PKG >/dev/null; then
-    USE_ARCHS=i386
-else
-    USE_ARCHS=$ARCHS
+if test -z "$PRODUCT"; then
+    if $debian; then
+	PRODUCT=`echo *.dsc|sed 's/_.*//g'`
+    else
+	PRODUCT=`cd ..;rpm -q --specfile *.spec --queryformat "%{NAME};" | cut -d ";" -f1`
+    fi
 fi
 echo "Dsc $PKG . Product $PRODUCT"
 echo "Ubuntu distros: $UBUNTU_DIST"
 echo "Debian distros: $DEBIAN_DIST"
 echo "Centos distros: $CENTOS_DIST"
-if test "${SUDO_USER}"; then
-    echo "Running as sudo."
-    echo "Tip: You can avoid it by adding the following in /etc/sudoers"
-    echo "${SUDO_USER} ALL=NOPASSWD: ${ID_DEB_BUILD}/id-pbuild-root.sh"
-    HOME_EXPORT=/home/${SUDO_USER}
-else
-    sudo -k
-    HOME_EXPORT=$HOME
-fi
-if test ! -f ${HOME_EXPORT}/.pbuilderrc; then
-    echo "${HOME_EXPORT}/.pbuilderrc missing"
-    exit 1
+
+if $debian; then
+    if test "${SUDO_USER}"; then
+	echo "Running as sudo."
+	echo "Tip: You can avoid it by adding the following in /etc/sudoers"
+	echo "${SUDO_USER} ALL=NOPASSWD: ${ID_DEB_BUILD}/id-pbuild-root.sh"
+	HOME_EXPORT=/home/${SUDO_USER}
+    else
+	sudo -k
+	HOME_EXPORT=$HOME
+    fi
+    if test ! -f ${HOME_EXPORT}/.pbuilderrc; then
+	echo "${HOME_EXPORT}/.pbuilderrc missing"
+	exit 1
+    fi
 fi
 
 if $upload; then
     for dist in ${CENTOS_DIST}; do
 	arch=amd64
 	prodver=${PRODUCT}-${VERSION}
-	if ssh $dist "cd rpmbuild/SOURCES/${prodver} && ../../../proj/git-tools/id-rpm-build/upload-rpms.sh ${PRODUCT}.spec"; then
+	if scp ${ID_DEB_BUILD}/../id-rpm-build/upload-rpms.sh ${dist}:rpmbuild/SOURCES/${prodver}/; then
 	    :
-	    else
+	else
+	    echo "Copy of upload-rpms.sh to $dist failed"
+	    exit 1
+	fi
+	if ssh $dist "cd rpmbuild/SOURCES/${prodver} && chmod +x upload-rpms.sh && ./upload-rpms.sh ${PRODUCT}.spec"; then
+	    :
+	else
 	    echo "Upload failed for $dist"
 	    exit 1
 	fi
@@ -180,10 +210,10 @@ for dist in ${CENTOS_DIST}; do
 	exit 1
     fi
 
-    if ssh $dist "test -f .rpmmacros && test -d rpmbuild/SOURCES && test -d rpmbuild/RPMS && test -d rpmbuild/SRPMS && test -x proj/git-tools/id-rpm-build/upload-rpms.sh"; then
+    if ssh $dist "test -f .rpmmacros && test -d rpmbuild/SOURCES && test -d rpmbuild/RPMS && test -d rpmbuild/SRPMS"; then
 	:
     else
-	echo "Host $dist does not seem to be prepared with git-tools and rpmbuild directories"
+	echo "Host $dist does not seem to be prepared with rpmbuild directories"
 	exit 1
     fi
 
diff --git a/id-release b/id-release
index bf56550..fd71ce8 100755
--- a/id-release
+++ b/id-release
@@ -76,7 +76,7 @@ perl -i.bak -npe "s,^Version: \d+.*,Version: $version," $spec
 ######################################################################
 echo ""
 echo "# Please commit the version updates now"
-echo "git commit -a"
+echo "git commit -a -m'new release v$version'"
 echo ""
 echo "# Please run now"
 echo "git push"
@@ -98,7 +98,8 @@ echo "sudo rpmbuild -ba $spec"
 echo "# if successfully, scp the package to ftp.indexdata.dk (kebab)"
 echo "\$HOME/proj/git-tools/id-rpm-build/upload-rpms.sh $spec"
 echo ""
-echo "# on kebab run: sudo su; cd $HOME/proj/git-tools/update-archive; ./update-yum-archive.sh"
+echo "# on kebab run: sudo su"
+echo "#               cd $HOME/proj/git-tools/update-archive && ./update-yum-archive.sh"
 
 
 ######################################################################
@@ -112,7 +113,8 @@ echo "sudo \$HOME/proj/git-tools/id-deb-build/id-pbuild.sh"
 echo "# if successfully, scp the package to ftp.indexdata.dk (kebab)"
 echo "\$HOME/proj/git-tools/id-deb-build/id-pbuild.sh --upload"
 echo ""
-echo "# on kebab run: sudo su; cd $HOME/proj/git-tools/update-archive; ./update-archive.sh"
+echo "# on kebab run: sudo su"
+echo "#               cd $HOME/proj/git-tools/update-archive && ./update-archive.sh"
 echo ""
 
 
diff --git a/update-archive/update-yum-archive.sh b/update-archive/update-yum-archive.sh
index f280e64..4983186 100755
--- a/update-archive/update-yum-archive.sh
+++ b/update-archive/update-yum-archive.sh
@@ -98,7 +98,7 @@ for vdist in centos/5.5 rhel/5.5 centos/6; do
                 fi
                 if $mustsign; then
                   ln -sf $f $d/${arch}/Packages/
-		  if rpm -K $f|grep -q ' gpg' >/dev/null; then
+		  if rpm -K $f|grep -q 'GPG' >/dev/null; then
 		    echo "Already signed $f"
                   else
   		    expect << __EOF
@@ -123,7 +123,10 @@ echo "Updating repository meta:"
 for rdir in ${dirs_to_upd}; do
   echo "Section ${rdir}"
   if test -d $rdir && ls -A $rdir; then
-  	createrepo --update ${rdir}
+	# Get rid of createrepo warnings
+	# https://bugs.launchpad.net/ubuntu/+source/createrepo/+bug/530015
+  	createrepo --update ${rdir} 2>&1 |
+		grep -v DeprecationWarning:|grep -v '  import'
   	if test -f ${rdir}/repodata/repomd.xml.asc; then
     		rm ${rdir}/repodata/repomd.xml.asc
   	fi