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.
This commit is contained in:
parent
d797f750e4
commit
11d3219985
4 changed files with 33 additions and 9 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue