diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-19 16:19:19 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-19 16:19:19 -0400 |
| commit | a1b1504ea8f9abd33cd1fa9fa6a9d3eeff468057 (patch) | |
| tree | c3a91c82206bbf4a1b625f0a249ccfb78559012b /standalone | |
| parent | ab93778d022b0dc0ec63177d191f3269191da6f3 (diff) | |
Linux and OSX standalone builds put the bundled gpg last in PATH, so any system gpg will be preferred over it.
Diffstat (limited to 'standalone')
| -rwxr-xr-x | standalone/linux/skel/runshell | 4 | ||||
| -rwxr-xr-x | standalone/osx/git-annex.app/Contents/MacOS/runshell | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/standalone/linux/skel/runshell b/standalone/linux/skel/runshell index 8c1db4247..fff0f7082 100755 --- a/standalone/linux/skel/runshell +++ b/standalone/linux/skel/runshell @@ -81,10 +81,10 @@ if [ -z "$GIT_ANNEX_PACKAGE_INSTALL" ]; then fi # Put our binaries first, to avoid issues with out of date or incompatable -# system binaries. +# system binaries. Extra binaries come after system path. ORIG_PATH="$PATH" export ORIG_PATH -PATH="$base/bin:$PATH" +PATH="$base/bin:$PATH:$base/extra" export PATH # These env vars are used by the shim wrapper around each binary. diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell index b48017f43..ab0076546 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/runshell +++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell @@ -61,10 +61,10 @@ if [ ! -e "$HOME/.ssh/git-annex-wrapper" ]; then fi # Put our binaries first, to avoid issues with out of date or incompatable -# system binaries. +# system binaries. Extra binaries come after system path. ORIG_PATH="$PATH" export ORIG_PATH -PATH="$bundle:$PATH" +PATH="$bundle:$PATH:$base/extra" export PATH ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH" |