From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 28 Apr 2008 17:44:37 +0000 (-0400)
Subject: Add PREFIX/bin to the hardcoded PATH within ikiwiki.
X-Git-Tag: 2.45~40
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9f02ee863454693dce8fcb209c28c1d2efa0ff77

Add PREFIX/bin to the hardcoded PATH within ikiwiki.
---

diff --git a/debian/changelog b/debian/changelog
index bcf3c9ac5..9b308e6b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (2.45) UNRELEASED; urgency=low
   * toc: Add the table of contents at sanitize time, rather than at format
     time. This allows the toc to be displayed when previewing an edit. It also
     avoids headers in the page template from showing up in the toc.
+  * Add PREFIX/bin to the hardcoded PATH within ikiwiki.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 26 Apr 2008 15:09:36 -0400
 
diff --git a/doc/bugs/__36__ENV__123__PATH__125___should_include_PREFIXbin.mdwn b/doc/bugs/__36__ENV__123__PATH__125___should_include_PREFIXbin.mdwn
index 160af9983..179c862ae 100644
--- a/doc/bugs/__36__ENV__123__PATH__125___should_include_PREFIXbin.mdwn
+++ b/doc/bugs/__36__ENV__123__PATH__125___should_include_PREFIXbin.mdwn
@@ -13,3 +13,5 @@ Please use full-path to installed "ikiwiki-transition" in the system() function
 Maybe pm_filter can handle this.
 
 ikiwiki installer already knows about PREFIX.
+
+[[done]]
diff --git a/pm_filter b/pm_filter
index 287adc376..a66cf2154 100755
--- a/pm_filter
+++ b/pm_filter
@@ -23,3 +23,6 @@ elsif (/^use lib/) {
 elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!/usr/bin/perl) -T$}) {
 	$_=qq{$1\n};
 }
+if (/^\$ENV{PATH}="(.*)";/) {
+	$_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
+}