Changeset 33 in MondoRescue for trunk/tools/mkdeliv

Timestamp:

Sep 29, 2005, 3:11:40 AM (19 years ago)

Author:

bcornec

Message:

Finer use of the release concept for tagging and delivery

File:

• trunk/tools/mkdeliv (modified) (2 diffs)

trunk/tools/mkdeliv

@@ -2 +2 @@
 #
 # Deliver RPMs packages and tgz files to BerliOS
+#
+# $Id$
+#
 
-. ./rpm-env
+dname=`dirname $0`
+prem=`echo $dname |cut -c1`
+if [ ${prem} == "/" ]; then
+        export TOOLHOME=$dname
+else
+    export TOOLHOME=${PWD}/$dname
+fi
+
+. $TOOLHOME/rpm-env
 
 tgz=""
 srpms=""
 rpms=""
-ct=`date "+%Y%m%d"`
+rev=`$TOOLHOME/mksvnversion`
 
 if [ "$1" = "" ]; then
@@ -16 +27 @@
 fi
 if [ "`echo $c | grep mindi`" != "" ]; then
-    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-${ct}.tgz
-    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-${ct}.tgz"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-1.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-1.src.rpm"
+    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz
+    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz"
+    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
+    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}.src.rpm"
 fi
 if [ "`echo $c | grep  mondo`" != "" ]; then
-    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-${ct}.tgz
-    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-${ct}.tgz"
-    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-1.${ARCH}.rpm"
-    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-1.src.rpm"
+    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
+    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz"
+    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"
+    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}.src.rpm"
 fi
 scp -p ${tgz} ${SVNAUTH}:${DSTDIR}/TGZ