From 5afc8b28e03f4d242fa81a9a93384714d12d4e5c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jul 2014 18:05:40 -0400
Subject: [PATCH] move git-annex to git/cmd

This way, it works both when using msgit, which will look in both bin and
cmd, but also when using cygwin's git, which only looks in PATH, which
includes cmd but not bin.
---
 Build/NullSoftInstaller.hs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index b50f64db35..b8fc826058 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -121,7 +121,7 @@ makeInstaller gitannex license extrabins launchers = nsis $ do
 		[ Target "wscript.exe"
 		, Parameters "\"$INSTDIR/git-annex-webapp.vbs\""
 		, StartOptions "SW_SHOWNORMAL"
-		, IconFile "$INSTDIR/bin/git-annex.exe"
+		, IconFile "$INSTDIR/cmd/git-annex.exe"
 		, IconIndex 2
 		, KeyboardShortcut "ALT|CONTROL|a"
 		, Description "git-annex webapp"
@@ -130,15 +130,16 @@ makeInstaller gitannex license extrabins launchers = nsis $ do
 		[ Target "wscript.exe"
 		, Parameters "\"$INSTDIR/git-annex-autostart.vbs\""
 		, StartOptions "SW_SHOWNORMAL"
-		, IconFile "$INSTDIR/bin/git-annex.exe"
+		, IconFile "$INSTDIR/cmd/git-annex.exe"
 		, IconIndex 2
 		, Description "git-annex autostart"
 		]
-	-- Groups of files to install
 	section "bins" [] $ do
 		setOutPath "$INSTDIR\\bin"
-		addfile gitannex
 		mapM_ addfile extrabins
+	section "cmd" [] $ do
+		setOutPath "$INSTDIR\\cmd"
+		addfile gitannex
 	section "meta" [] $ do
 		setOutPath "$INSTDIR"
 		addfile license
@@ -147,13 +148,13 @@ 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" $
+			launchers ++
 			[ license
 			, uninstaller
-			] ++ launchers
-		removefilesFrom "$INSTDIR/bin" $
-			[ gitannex
-			] ++ extrabins
+			]
   where
 	addfile f = file [] (str f)
 	removefilesFrom d = mapM_ (\f -> delete [RebootOK] $ fromString $ d ++ "/" ++ takeFileName f)