From a1b1504ea8f9abd33cd1fa9fa6a9d3eeff468057 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 19 Feb 2016 16:19:19 -0400 Subject: Linux and OSX standalone builds put the bundled gpg last in PATH, so any system gpg will be preferred over it. --- standalone/linux/skel/runshell | 4 ++-- standalone/osx/git-annex.app/Contents/MacOS/runshell | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'standalone') 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" -- cgit v1.2.3