[med-svn] r6813 - trunk/packages/ensembl/ensembl/62/debian

[Steffen Möller]

Author: moeller
Date: 2011-05-11 14:45:19 +0000 (Wed, 11 May 2011)
New Revision: 6813

Modified:
   trunk/packages/ensembl/ensembl/62/debian/prepare_ensembl_source_packages.sh
   trunk/packages/ensembl/ensembl/62/debian/rules
Log:
Introduced W: and I: for status messages.


Modified: trunk/packages/ensembl/ensembl/62/debian/prepare_ensembl_source_packages.sh
===================================================================
--- trunk/packages/ensembl/ensembl/62/debian/prepare_ensembl_source_packages.sh	2011-05-11 14:38:24 UTC (rev 6812)
+++ trunk/packages/ensembl/ensembl/62/debian/prepare_ensembl_source_packages.sh	2011-05-11 14:45:19 UTC (rev 6813)
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# bail out upon error
 set -e
 
 startdir=`pwd`
@@ -8,7 +9,7 @@
 
 
 if [ -d debian ]; then
-	echo "Found debian directory, retrieving Ensembl version from debian/changelog"
+	echo "I: Found debian directory, retrieving Ensembl version from debian/changelog"
 	ensemblversion=`dpkg-parsechangelog | grep ^Version | head -1 | cut -f2 -d\ | cut -f1 -d-`
 	destdir=..
 fi
@@ -17,13 +18,14 @@
 
 # All libraries must be of the same version - update them all or none
 if [ -z "$ensemblversion" ]; then
+	echo "W: Ensembl version previously unset, setting to '62'."
 	ensemblversion=62
 fi
 
 downloaddir=$destdir/$ensemblversion.$$
 
 
-echo "Will download to directory '$downloaddir'."
+echo "I: Will download to directory '$downloaddir'."
 
 if [ ! -d "$downloaddir" ] ; then 
 	mkdir "$downloaddir"
@@ -32,11 +34,11 @@
 
 export CVSROOT=":pserver:cvsuser at cvs.sanger.ac.uk:/cvsroot/ensembl"
 
-echo "Logging in to Sanger CVS, type password CVSUSER"
+echo " * Logging in to Sanger CVS, type password CVSUSER"
 cvs login
 
 echo
-echo " Performing checkout"
+echo "I: Performing checkout"
 echo
 
 for package in	ensembl-api ensembl-website
@@ -45,7 +47,7 @@
 	echo "			$package"
 	echo "----------------------------------------------------"
 	if [ -d "$dname" ]; then
-		echo "Skipping fetch of package '$dname', directory is already existing."
+		echo "W: Skipping fetch of package '$dname', directory is already existing."
 		#(cd $i && cvs -z 3 update .)
 	else 
 		cvs -z 3 checkout -r branch-ensembl-${ensemblversion} ${package}
@@ -63,14 +65,14 @@
 
 cd "$startdir"
 
-echo "  Renaming for looking nice to ensembl-$ensemblversion"
+echo "I: Renaming for looking nice to ensembl-$ensemblversion"
 if [ -e "$$destdir/ensembl-$ensemblversion" ]; then
-	echo "Moving existing file/folder 'ensembl-$ensemblversion' to 'ensembl-$ensemblversion.old'"
+	echo "   Moving existing file/folder 'ensembl-$ensemblversion' to 'ensembl-$ensemblversion.old'"
 	rm -rf "ensembl-$ensemblversion.old" 
 	mv "$$destdir/ensembl-$ensemblversion" "$$destdir/ensembl-$ensemblversion.old"
 fi
 
-echo "  Removing a series of files for better DFSG compliance"
+echo "I: Removing a series of files for better DFSG compliance"
 find "$destdir"/"ensembl-$ensemblversion" -name "*.pdf" | grep -v ComparaTutorial | xargs -r rm
 rm -f "$destdir"/"ensembl-$ensemblversion"/ensembl-compara/scripts/synteny/BuildSynteny.jar
 # The jalview.jar needs to remain in the source tree
@@ -81,7 +83,7 @@
 GZIP="--best --no-name" tar czvf ensembl_${ensemblversion}.orig.tar.gz ensembl-$ensemblversion
 
 echo
-echo "Success."
+echo "I: Success."
 echo
-echo "Left downloaded folder '$destdir/ensembl-$ensemblversion' intact."
+echo "I: Left downloaded folder '$destdir/ensembl-$ensemblversion' intact."
 echo

Modified: trunk/packages/ensembl/ensembl/62/debian/rules
===================================================================
--- trunk/packages/ensembl/ensembl/62/debian/rules	2011-05-11 14:38:24 UTC (rev 6812)
+++ trunk/packages/ensembl/ensembl/62/debian/rules	2011-05-11 14:45:19 UTC (rev 6813)
@@ -159,7 +159,7 @@
 	dh_builddeb
 
 get-orig-source:
-	. debian/prepare_ensembl_source_packages.sh
+	./debian/prepare_ensembl_source_packages.sh
 
 # To update po files as recommended in po-debconf(7)
 debian/po/templates.pot: debian/ensembl.templates