[rkward-cvs] SF.net SVN: rkward:[4164] trunk/rkward/macports/update_bundle.sh

[m-eik at users.sourceforge.net]

Revision: 4164
          http://rkward.svn.sourceforge.net/rkward/?rev=4164&view=rev
Author:   m-eik
Date:     2012-03-05 17:16:33 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
corrected the bundle script

Modified Paths:
--------------
    trunk/rkward/macports/update_bundle.sh

Modified: trunk/rkward/macports/update_bundle.sh
===================================================================
--- trunk/rkward/macports/update_bundle.sh	2012-03-05 15:39:12 UTC (rev 4163)
+++ trunk/rkward/macports/update_bundle.sh	2012-03-05 17:16:33 UTC (rev 4164)
@@ -47,14 +47,6 @@
   esac
 done
 
-if [[ $UPRKWARD || $MKSRCTAR || $COPYMDMD ]] ; then
-  # get SVN revision number
-  echo "get SVN revision number..."
-  SVNREV=$(svn info http://rkward.svn.sourceforge.net/svnroot/rkward/trunk 2>&1 | grep "^Revision:" | sed -e 's/[^[:digit:]]*//g')
-  echo "Revision: $SVNREV"
-  SRCFILE=${SRCPATH}/sources_bundle_svn$SVNREV_${SRCDATE}.tar
-fi
-
 # update installed ports
 if [[ $UPMPORTS ]] ; then
   sudo port selfupdate
@@ -86,7 +78,7 @@
   # copy the image file to a public directory
   if [[ $COPYMDMD ]] ; then
     MDMGFILE=${WORKDIR}/${PTARGET}-${PORTVERS}.dmg
-    TRGTFILE=${LPUBDIR}/RKWard-${PORTVERS}${SVNREV}_R-${RVERS}_KDE-${KDEVERS}_MacOSX_bundle.dmg
+    TRGTFILE=${LPUBDIR}/RKWard-${PORTVERS}_R-${RVERS}_KDE-${KDEVERS}_MacOSX_bundle.dmg
     echo "copying: $MDMGFILE to $TRGTFILE ..."
     cp -av $MDMGFILE $TRGTFILE
     echo "done."
@@ -95,13 +87,18 @@
 
 # archive sources
 if [[ $MKSRCTAR ]] ; then
+  if [[ ! $COPYMDMD ]] ; then
+    # get version information of installed ports
+    PORTVERS=$(port list $PTARGET | sed -e "s/.*@//;s/[[:space:]].*//")
+  fi
+  SRCFILE=${SRCPATH}/sources_bundle_RKWard-${PORTVERS}_${SRCDATE}.tar
   if [ -f $SRCFILE ] ; then
     rm $SRCFILE || exit 1
   fi
   tar cvf $SRCFILE ${MPTINST}/var/macports/distfiles || exit 1
   # copy the source archive to a public directory
   if [[ $COPYMDMD ]] ; then
-    TRGSFILE=${LPUBDIR}/RKWard-${PORTVERS}${SVNREV}_R-${RVERS}_KDE-${KDEVERS}_src.tar
+    TRGSFILE=${LPUBDIR}/RKWard-${PORTVERS}_R-${RVERS}_KDE-${KDEVERS}_src.tar
     echo "copying: $SRCFILE to $TRGSFILE ..."
     cp -av $SRCFILE $TRGSFILE
     echo "done."

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