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

Windows: Install ssh and other bundled programs to Git/cmd, instead of Git/bin, since the latter is not in the default msysgit PATH.

Browse source
This commit is contained in:
Joey Hess 2014-12-03 13:34:13 -04:00
parent 10b139956a
commit e292310ba3
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Build/BundledPrograms.hs
View file

@ -31,17 +31,15 @@ bundledPrograms = catMaybes
, Just "cp"
#ifndef mingw32_HOST_OS
-- using xargs on windows led to problems, so it's not used there
-- (and msysgit includes a copy anyway)
, 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, msysgit provides ssh, but not ssh-keygen.
-- On Windows, msysgit provides ssh, but not in PATH,
-- so we ship our own.
, Just "ssh"
#endif
, Just "ssh-keygen"
#endif
#ifndef mingw32_HOST_OS