[med-svn] r8790 - trunk/packages/ensembl/ensembl/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-12-06 15:53:46 +0000 (Tue, 06 Dec 2011)
New Revision: 8790

Modified:
   trunk/packages/ensembl/ensembl/trunk/debian/adjust_shebang_line.sh
   trunk/packages/ensembl/ensembl/trunk/debian/changelog
Log:
Suppress noise when changing scripts


Modified: trunk/packages/ensembl/ensembl/trunk/debian/adjust_shebang_line.sh
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/adjust_shebang_line.sh	2011-12-06 12:55:26 UTC (rev 8789)
+++ trunk/packages/ensembl/ensembl/trunk/debian/adjust_shebang_line.sh	2011-12-06 15:53:46 UTC (rev 8790)
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+VERBOSE=false
+
 for i in "$@"
 do
 
@@ -10,11 +12,11 @@
 			chmod -x "$i"
 		else
 			chmod 755 "$i"
-			echo "OK:         '$i'"
+			if [ "$VERBOSE" = "true" ] ; then echo "OK:         '$i'" ; fi
 		fi
 		continue
 	elif echo "$i" | egrep -q '.pm$'; then
-		echo "OK:         '$i'"
+		if [ "$VERBOSE" = "true" ] ; then echo "OK:         '$i'" ; fi
 		chmod 644 "$i"
 		continue
 	fi
@@ -25,16 +27,16 @@
 			exit -1
 		elif echo "$i" | egrep -q '*.t$'; then
 			if [ ! -x "$i" ]; then
-				echo "Remove for non-executable .t:  '$i'"
+				if [ "$VERBOSE" = "true" ] ; then echo "Remove for non-executable .t:  '$i'" ; fi
 				# not executable, should then lose shebang line
 				# well, it should not have one in the first place
 				sed -i '1s%^#!.*$%%' $i
 				continue
 			fi
 		fi
-		echo "Substitute: '$i'"
+		if [ "$VERBOSE" = "true" ] ; then echo "Substitute: '$i'" ; fi
 		if head -n 1 "$i" | grep -q perl; then
-			echo Perl
+			if [ "$VERBOSE" = "true" ] ; then echo Perl ; fi
 			# remove version from Perl
 			sed -i '1s%perl5[0-9.]*%perl%' $i
 			# now the path substitution, keeping arguments to Perl intact
@@ -42,24 +44,24 @@
 			# also seen
 			sed -i '1s%#!perl%#!/usr/bin/perl%' $i
 		elif head -n 1 "$i" | grep -q wish; then
-			echo Tcl/Tk
+			if [ "$VERBOSE" = "true" ] ; then echo Tcl/Tk ; fi
 			sed -i '1s%#!\s*/.*/wish.*%#!/usr/bin/wish%' $i
 		else
-			echo BASH
+			if [ "$VERBOSE" = "true" ] ; then echo BASH ; fi
 			sed -i '1s%#!\s*/.*/bash%#!/bin/bash%' $i
 		fi
 		chmod 755 "$i"
 	else
 		if echo "$i" | egrep -q '*.t$'; then
 			if [ ! -x "$i" ]; then
-				echo "Leave without:     '$i'"
+				if [ "$VERBOSE" = "true" ] ; then echo "Leave without:     '$i'" ; fi
 				# not executable, should then lose shebang line
 				# well, it should not have one in the first place
 				sed -i '1s%^#!.*$%%' $i
 				continue
 			fi
 		fi 
-		echo "Insert:     '$i'"
+		if [ "$VERBOSE" = "true" ] ; then echo "Insert:     '$i'" ; fi
 		if echo "$i" | egrep -q '.(pl|t)$' || egrep -q "use\s\s*strict\s*;" $i; then
 			sed -i '1i#!/usr/bin/perl\n' $i
 			chmod 755 "$i"

Modified: trunk/packages/ensembl/ensembl/trunk/debian/changelog
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/changelog	2011-12-06 12:55:26 UTC (rev 8789)
+++ trunk/packages/ensembl/ensembl/trunk/debian/changelog	2011-12-06 15:53:46 UTC (rev 8790)
@@ -27,6 +27,13 @@
     - stripped down to the really needed bits
   * rename debian/prepare_ensembl_source_packages.sh to get-orig-source
     to comply with other packages
+  * debian/{pre,post}{install,rm}: Cleaned up useless dh-make template
+    comments
+  * debian/{ensembl.postinst,init.d}: Do not stop apache2 but leave a
+    FIXME comment that this was done previosely to keep a record in case
+    something might fail
+  * debian/adjust_shebang_line.sh: Be less verbose but provide an easy option
+    to switch on verbosity
 
  -- Andreas Tille <tille at debian.org>  Wed, 30 Nov 2011 13:30:15 +0100