[med-svn] r5428 - trunk/packages/ensembl/ensembl/57/debian

[Steffen Möller]

Author: moeller
Date: 2010-11-11 18:41:57 +0000 (Thu, 11 Nov 2010)
New Revision: 5428

Modified:
   trunk/packages/ensembl/ensembl/57/debian/ensembl.links
   trunk/packages/ensembl/ensembl/57/debian/init.d
   trunk/packages/ensembl/ensembl/57/debian/rules
Log:
Working more towards lintian cleanliness.


Modified: trunk/packages/ensembl/ensembl/57/debian/ensembl.links
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/ensembl.links	2010-11-11 17:40:41 UTC (rev 5427)
+++ trunk/packages/ensembl/ensembl/57/debian/ensembl.links	2010-11-11 18:41:57 UTC (rev 5428)
@@ -1,4 +1,5 @@
 /usr/share/ensembl/logs /var/log/ensembl
 /usr/share/ensembl/img-cache /var/cache/ensembl/img-cache
-/usr/share/ensembl/img-tmp /var/tmp/ensembl/img-tmp
-/usr/share/ensembl/tmp /var/tmp/ensembl/tmp
+# should be created at start time, not now.
+#/usr/share/ensembl/img-tmp /var/tmp/ensembl/img-tmp
+#/usr/share/ensembl/tmp /var/tmp/ensembl/tmp

Modified: trunk/packages/ensembl/ensembl/57/debian/init.d
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/init.d	2010-11-11 17:40:41 UTC (rev 5427)
+++ trunk/packages/ensembl/ensembl/57/debian/init.d	2010-11-11 18:41:57 UTC (rev 5428)
@@ -87,12 +87,20 @@
 
 case $1 in
 	start)
-		for d in /var/log/ensembl/logs /var/cache/ensembl/img-cache /var/tmp/ensembl/img-tmp /var/tmp/ensembl/tmp
-		do
-			if [ ! -d "$d" ]; then mkdir -p "$d"; fi
-			chown nobody.nogroup "$d"
-			chmod 755 "$d"
-		done
+		# /var/log/ensembl/logs         # this is a symlink set by the Debian package
+		# /var/cache/ensembl/img-cache  # this is set as a symlink further down
+		# /var/tmp/ensembl/img-tmp      # another symlink set further down
+		# /var/tmp/ensembl/tmp          # and yet another one 
+		# for d in /var/cache/ensembl/img-cache /var/tmp/ensembl/img-tmp /var/tmp/ensembl/tmp
+		# do
+		# 	if [ ! -d "$d" ]; then mkdir -p "$d"; fi
+		# 	chown nobody.nogroup "$d"
+		# 	chmod 755 "$d"
+		# done
+		ln -s /usr/share/ensembl/img-cache /var/cache/ensembl/img-cache
+		ln -s /usr/share/ensembl/img-tmp /var/tmp/ensembl/img-tmp
+		ln -s /usr/share/ensembl/tmp /var/tmp/ensembl/tmp
+
 		log_daemon_msg "Starting web server" "ensembl"
 		if $APACHE2CTL start; then
                         log_end_msg 0

Modified: trunk/packages/ensembl/ensembl/57/debian/rules
===================================================================
--- trunk/packages/ensembl/ensembl/57/debian/rules	2010-11-11 17:40:41 UTC (rev 5427)
+++ trunk/packages/ensembl/ensembl/57/debian/rules	2010-11-11 18:41:57 UTC (rev 5428)
@@ -40,6 +40,7 @@
 	#d=$(DESTDIR)/usr/share/ensembl
 	echo "Adjusting path to Perl wherever it may be found" ; \
 	egrep -rl "^#!\s*/.*/perl" . | grep -v "/.pc/" | xargs -r --max-args 1 sed -i '1s%^#!\s*/\(usr\|localsw\)/.*/perl%#!/usr/bin/perl%' ; \
+	egrep -rl "^#!\s*/.*/perl" . | grep -v "/.pc/" | xargs -r --max-args 1 sed -i '1s%^#!\s*/\(usr\|localsw\|software\)/.*/perl%#!/usr/bin/perl%' ; \
 	echo "Adjusting path to Bash wherever it may be found" ; \
 	egrep -rl "^#!\s*/.*/bash" . | grep -v "/.pc/" | xargs -r --max-args 1 sed -i '1s%^#!\s*/\(usr\|localsw\)/.*/bash%#!/bin/bash%' ; \
 	egrep -rl "^#!.*ENV.*PERL" . | grep -v "/.pc/" | xargs -r --max-args 1 sed -i '1s%^#!.*%#!/usr/bin/perl%' ; \