From 260e338d30d8d14aa5eea00b7b8f3da157c556bd Mon Sep 17 00:00:00 2001 From: Rob Church Date: Tue, 30 May 2006 14:52:43 +0000 Subject: [PATCH] Add /usr/local/bin to the diff3 search paths in the installer --- RELEASE-NOTES | 1 + config/index.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 6066af33cb..2b3d260de6 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -382,6 +382,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 6139) Workaround for transclusion oddities in Vietnamese upload text * (bug 6136) Update to Catalan language (ca) * Update to Japanese localization (ja) +* Add /usr/local/bin to the diff3 search paths in the installer == Compatibility == diff --git a/config/index.php b/config/index.php index d00b3f5d89..05b3eebfd8 100644 --- a/config/index.php +++ b/config/index.php @@ -345,7 +345,7 @@ if (!$conf->turck && !$conf->eaccel && !$conf->apc) { } $conf->diff3 = false; -$diff3locations = array("/usr/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH")); +$diff3locations = array("/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH")); $diff3names = array("gdiff3", "diff3", "diff3.exe"); $diff3versioninfo = array('$1 --version 2>&1', 'diff3 (GNU diffutils)'); -- 2.20.1