pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ruby Make sure the shebang line replacement for R...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/08668392ba2f
branches:  trunk
changeset: 547587:08668392ba2f
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Sep 21 21:50:31 2008 +0000

description:
Make sure the shebang line replacement for Ruby alters only a shebang line.

Previously, it altered lines that did not start with "#!".  This, with
the recent change in misc/rubygems/rubygems 1.39, broke www/rails.

diffstat:

 lang/ruby/replace.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r d5413976a271 -r 08668392ba2f lang/ruby/replace.mk
--- a/lang/ruby/replace.mk      Sun Sep 21 19:41:42 2008 +0000
+++ b/lang/ruby/replace.mk      Sun Sep 21 21:50:31 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.10 2008/09/15 08:40:55 taca Exp $
+# $NetBSD: replace.mk,v 1.11 2008/09/21 21:50:31 minskim Exp $
 #
 
 .if !defined(_RUBY_REPLACE_MK)
@@ -46,8 +46,8 @@
            ${FIND} $$dirs \
                -type f ${_REPLACE_RUBY_FIND_ARGS} -print | \
            while read f; do \
-               ${SED}  -e '1s| *[a-z0-9_/\.-][a-z0-9_/\.-]*/env *||g' \
-                       -e '1s| *[a-z0-9_/\.-]*ruby|${RUBY}|' $$f > $$f.tmp; \
+               ${SED}  -e '1s|^#! *[a-z0-9_/\.-][a-z0-9_/\.-]*/env *|#!|g' \
+                       -e '1s|^#! *[a-z0-9_/\.-]*ruby|#!${RUBY}|' $$f > $$f.tmp; \
                if ${CMP} -s $$f $$f.tmp; then \
                        ${RM} $$f.tmp; \
                else \



Home | Main Index | Thread Index | Old Index