From 191e80050f4d314061d4d585a65f9aacb41f5b61 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Mar 2017 17:40:40 -0400 Subject: Linux standalone builds put the bundled ssh last in PATH, so any system ssh will be preferred over it. This commit was sponsored by Denis Dzyubenko on Patreon. --- Build/BundledPrograms.hs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Build/BundledPrograms.hs') diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index a9a29b603..271e1dd98 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -31,6 +31,16 @@ extraBundledPrograms = catMaybes [ SysConfig.gpg #else [ +#endif +#ifndef darwin_HOST_OS +#ifndef mingw32_HOST_OS + -- OS X has ssh installed by default. + -- On Windows, git provides ssh. + -- Linux probably has ssh installed system wide, + -- and if so the user probably wants to use that one. + , Just "ssh" + , Just "ssh-keygen" +#endif #endif ] @@ -57,15 +67,6 @@ preferredBundledPrograms = catMaybes , Just "xargs" #endif , Just "rsync" -#ifndef darwin_HOST_OS -#ifndef mingw32_HOST_OS - -- OS X has ssh installed by default. - -- Linux probably has ssh, but not guaranteed. - -- On Windows, git provides ssh. - , Just "ssh" - , Just "ssh-keygen" -#endif -#endif #ifndef mingw32_HOST_OS , Just "sh" #endif -- cgit v1.2.3