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

Windows: ssh is no longer included in the git-annex bundle, since msysgit includes it.

Browse source
This commit is contained in:
Joey Hess 2014-12-03 13:26:05 -04:00
parent f7e7cc82c7
commit 10b139956a
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Build/BundledPrograms.hs
View file

@ -20,7 +20,7 @@ bundledPrograms :: [FilePath]
bundledPrograms = catMaybes
[ Nothing
#ifndef mingw32_HOST_OS
-- git is not included in the windows bundle
-- git is not included in the windows bundle; msysgit is used
, Just "git"
-- Not strictly needed in PATH by git-annex, but called
-- by git when it sshes to a remote.
@ -31,13 +31,17 @@ 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, but not guaranteed.)
-- Linux probably has ssh, but not guaranteed.
-- On Windows, msysgit provides ssh, but not ssh-keygen.
, Just "ssh"
#endif
, Just "ssh-keygen"
#endif
#ifndef mingw32_HOST_OS