[rkward-cvs] SF.net SVN: rkward:[2926] trunk/rkward/scripts/makeosc_upload.sh

[tfry at users.sourceforge.net]

Revision: 2926
          http://rkward.svn.sourceforge.net/rkward/?rev=2926&view=rev
Author:   tfry
Date:     2010-07-02 06:27:17 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
Opensuse build service does not accept dashes in the version string

Modified Paths:
--------------
    trunk/rkward/scripts/makeosc_upload.sh

Modified: trunk/rkward/scripts/makeosc_upload.sh
===================================================================
--- trunk/rkward/scripts/makeosc_upload.sh	2010-07-01 20:57:53 UTC (rev 2925)
+++ trunk/rkward/scripts/makeosc_upload.sh	2010-07-02 06:27:17 UTC (rev 2926)
@@ -5,6 +5,8 @@
 ## end: These may need adjusting!
 
 VERSION=${1}
+# RPM does not accept dashes in the version name...
+VERSION=`echo -n ${VERSION} | sed -e 's/-/_/g'`
 cd `dirname $0`/..
 BASEDIR=`pwd`
 OSCTEMPDIR=${BASEDIR}/osctemp
@@ -20,11 +22,10 @@
 # create source snapshot
 cd ${BASEDIR}
 ${BASEDIR}/scripts/makedist.sh $VERSION
-OSCVERSION=`echo -n ${VERSION} | sed -e 's/-/_/g'`
-cp ${BASEDIR}/rkward-$VERSION.tar.gz $OSCTEMPDIR/${OSCREPOS}/rkward/rkward-$OSCVERSION.tar.gz
-osc add $OSCTEMPDIR/${OSCREPOS}/rkward/rkward-$OSCVERSION.tar.gz
+cp ${BASEDIR}/rkward-$VERSION.tar.gz $OSCTEMPDIR/${OSCREPOS}/rkward/rkward-$VERSION.tar.gz
+osc add $OSCTEMPDIR/${OSCREPOS}/rkward/rkward-$VERSION.tar.gz
 
 cd $OSCTEMPDIR/${OSCREPOS}/rkward/
-sed -i rkward.spec -e "s/Version:.*$/Version:        ${OSCVERSION}/"
+sed -i rkward.spec -e "s/Version:.*$/Version:        ${VERSION}/"
 osc commit -m "New development snapshot: ${VERSION}"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.