diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-07 15:43:36 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-07 15:53:03 -0400 |
| commit | c60ba579661ed502d361eca0e7ce94c8a6544fc7 (patch) | |
| tree | 4745de66b582314a529f7a7428aa0e41264ac0c5 /Build | |
| parent | 118932d39319b467f2b2e8c244cd722bafd19298 (diff) | |
Windows: Remove cygwin ssh, the newer version of which has stopped honoring the setting of HOME. Instead, copy msysgit's ssh into PATH.
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/BundledPrograms.hs | 5 | ||||
| -rw-r--r-- | Build/NullSoftInstaller.hs | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index 1e826cb10..4ceee3b52 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -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 diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 0abd07f95..e9a22d843 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -92,7 +92,7 @@ uninstaller = "git-annex-uninstall.exe" gitInstallDir :: Exp FilePath
gitInstallDir = fromString "$PROGRAMFILES\\Git"
--- This intentionall has a different name than git-annex or
+-- This intentionally has a different name than git-annex or
-- git-annex-webapp, since it is itself treated as an executable file.
-- Also, on XP, the filename is displayed, not the description.
startMenuItem :: Exp FilePath
@@ -152,6 +152,9 @@ makeInstaller gitannex license htmlhelp extrabins launchers = nsis $ do section "cmd" [] $ do
setOutPath "$INSTDIR\\cmd"
mapM_ addfile (gitannex:extrabins)
+ -- copy msysgit's ssh into cmd so it's always in PATH
+ -- (bin is only in PATH from git bash)
+ copyFiles [] "$INSTDIR\\bin\\ssh.exe" "$INSTDIR\\cmd\\ssh.exe"
section "meta" [] $ do
setOutPath "$INSTDIR\\doc\\git\\html"
addfile htmlhelp
|