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

Build/BundledPrograms.hs

@@ -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

Build/NullSoftInstaller.hs

@@ -133,12 +133,9 @@ makeInstaller gitannex license extrabins launchers = nsis $ do
 		, IconIndex 2
 		, Description "git-annex autostart"
 		]
-	section "bins" [] $ do
-		setOutPath "$INSTDIR\\bin"
-		mapM_ addfile extrabins
 	section "cmd" [] $ do
 		setOutPath "$INSTDIR\\cmd"
-		addfile gitannex
+		mapM_ addfile (gitannex:extrabins)
 	section "meta" [] $ do
 		setOutPath "$INSTDIR"
 		addfile license
@@ -147,8 +144,7 @@ makeInstaller gitannex license extrabins launchers = nsis $ do
 	uninstall $ do
 		delete [RebootOK] $ startMenuItem
 		delete [RebootOK] $ autoStartItem
-		removefilesFrom "$INSTDIR/bin" extrabins
-		removefilesFrom "$INSTDIR/cmd" [gitannex]
+		removefilesFrom "$INSTDIR/cmd" (gitannex:extrabins)
 		removefilesFrom "$INSTDIR" $
 			launchers ++
 			[ license