packages: cacti/cacti.spec - do not add duplicate shebangs

glen glen at pld-linux.org
Wed Apr 14 17:17:10 CEST 2010


Author: glen                         Date: Wed Apr 14 15:17:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not add duplicate shebangs

---- Files affected:
packages/cacti:
   cacti.spec (1.118 -> 1.119) 

---- Diffs:

================================================================
Index: packages/cacti/cacti.spec
diff -u packages/cacti/cacti.spec:1.118 packages/cacti/cacti.spec:1.119
--- packages/cacti/cacti.spec:1.118	Wed Apr 14 17:13:18 2010
+++ packages/cacti/cacti.spec	Wed Apr 14 17:17:05 2010
@@ -147,11 +147,12 @@
 rm -f cli/.htaccess
 rm -f rra/.placeholder
 
-%{__sed} -i -e '1i#!%{_bindir}/php' scripts/*.php
-chmod a+rx scripts/*
+# make sure scripts have php shebang
+%{__sed} -i -e '1{
+    /bin.php/!i#!%{_bindir}/php
+}' scripts/*.php  cli/*.php
 
-%{__sed} -i -e '1i#!%{_bindir}/php' cli/*.php
-chmod a+rx cli/*
+chmod a+rx scripts/*.php cli/*.php
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -266,6 +267,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.119  2010/04/14 15:17:05  glen
+- do not add duplicate shebangs
+
 Revision 1.118  2010/04/14 15:13:18  glen
 - make sure cli programs work from any current dir; rel 8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti/cacti.spec?r1=1.118&r2=1.119&f=u



More information about the pld-cvs-commit mailing list