urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Match word boundary (think "/usr/bin/perl5.18").

master
Amitai Schlair 2014-10-19 12:59:53 -04:00
parent f47af2b8c4
commit 9f04f8ccc5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.PL
View File

@ -63,7 +63,7 @@ docwiki:
perl_shebangs: perl_shebangs:
ifneq "$(PERL)" "/usr/bin/perl" ifneq "$(PERL)" "/usr/bin/perl"
for file in $(shebang_scripts); do \ for file in $(shebang_scripts); do \
$(SED) -e "1s|^#!/usr/bin/perl|#!$(PERL)|" < $$file > "$$file.new"; \ $(PERL) -pe "s|^#!/usr/bin/perl\b|#!$(PERL)| if 1" < $$file > "$$file.new"; \
[ -x $$file ] && chmod +x "$$file.new"; \ [ -x $$file ] && chmod +x "$$file.new"; \
mv -f "$$file.new" $$file; \ mv -f "$$file.new" $$file; \
done done
@ -72,7 +72,7 @@ endif
perl_shebangs_clean: perl_shebangs_clean:
ifneq "$(PERL)" "/usr/bin/perl" ifneq "$(PERL)" "/usr/bin/perl"
for file in $(shebang_scripts); do \ for file in $(shebang_scripts); do \
$(SED) -e "1s|^#!$(PERL)|#!/usr/bin/perl|" < $$file > "$$file.new"; \ $(PERL) -pe "s|^#!$(PERL)\b|#!/usr/bin/perl| if 1" < $$file > "$$file.new"; \
[ -x $$file ] && chmod +x "$$file.new"; \ [ -x $$file ] && chmod +x "$$file.new"; \
mv -f "$$file.new" $$file; \ mv -f "$$file.new" $$file; \
done done

6
doc/bugs/double_shebang_replacement___47__usr__47__bin__47__perl5.185.18.mdwn
View File

@ -1,4 +1,4 @@
Please consider this [patch] for merging in. Please consider this [[patch]] for merging in.
[[!format diff """ [[!format diff """
From e697ba4ef7952ce549d449c4e4daea2e3f0a1aa7 Mon Sep 17 00:00:00 2001 From e697ba4ef7952ce549d449c4e4daea2e3f0a1aa7 Mon Sep 17 00:00:00 2001
From: Nikolay Orlyuk <virkony@gmail.com> From: Nikolay Orlyuk <virkony@gmail.com>
@ -36,3 +36,7 @@ index 61fe336..2d54658 100755
-- --
2.1.2 2.1.2
"""]] """]]
[[Done]], but this word-boundary construct didn't work on at least
one of my systems, so now we're using `$(PERL)` to do the job
portably.