From 8b6fc615f4fe7b5d88fd628c1fe175a49b83f35b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 3 Apr 2013 12:58:39 -0700
Subject: [PATCH] Ignore and README for `support/bin`

Summary:
See D5561. Ref T2378.

  - Add `support/bin/*` to .gitignore so any symlinks or binaries won't get picked up by Git.
  - Add a README so Git preserves the directory and there's at least //some// documentation of its existence.

Test Plan: ummmmm

Reviewers: jevripio, codeblock, btrahan

Reviewed By: jevripio

CC: aran

Maniphest Tasks: T2378

Differential Revision: https://secure.phabricator.com/D5562
---
 .gitignore                                                     | 3 +++
 .../config/option/PhabricatorCoreConfigOptions.php             | 3 ++-
 support/bin/README                                             | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 support/bin/README

diff --git a/.gitignore b/.gitignore
index fc3ad0e0f6..6ea4dd528b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,6 @@
 
 # User-accessible hook for adhoc debugging scripts
 /support/debug.php
+
+# Users can link binaries here
+/support/bin/*
diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
index c608e4f4e5..a5910c2441 100644
--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -84,7 +84,8 @@ final class PhabricatorCoreConfigOptions
             "of the user running Phabricator (normally 'apache', 'httpd', or ".
             "'nobody'). Here you can add extra directories to the \$PATH ".
             "environment variable, for when these binaries are in ".
-            "non-standard locations."))
+            "non-standard locations. Note that you can also put binaries in ".
+            "`phabricator/support/bin`."))
         ->addExample('/usr/local/bin', pht('Add One Path'))
         ->addExample("/usr/bin\n/usr/local/bin", pht('Add Multiple Paths')),
        $this->newOption('tokenizer.ondemand', 'bool', false)
diff --git a/support/bin/README b/support/bin/README
new file mode 100644
index 0000000000..22761983cd
--- /dev/null
+++ b/support/bin/README
@@ -0,0 +1,3 @@
+Phabricator will look in this directory for binaries (like "git", "hg", "svn",
+"diff", etc) before looking elsewhere. If you want Phabricator to use a
+specific version of some binary, copy or symlink it here.