mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Windows: Remove cygwin ssh, the newer version of which has stopped honoring the setting of HOME. Instead, copy msysgit's ssh into PATH.

Browse source
This commit is contained in:
Joey Hess 2015-05-07 15:43:36 -04:00
parent 00e426f738
commit ce285ea6fa
4 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Build/BundledPrograms.hs
View file

@ -35,13 +35,14 @@ bundledPrograms = catMaybes
#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, msysgit provides ssh, but not in PATH,
-- so we ship our own.
-- On Windows, msysgit provides ssh.
, Just "ssh"
, Just "ssh-keygen"
#endif
#endif
#ifndef mingw32_HOST_OS
, Just "sh"
#endif