From 17e109d5c29b02be9bc83aa97afb0364c1211c56 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 11 Dec 2013 11:16:11 -0400
Subject: try to get it to include the cygwin ssh, not the msysgit one

---
 standalone/windows/build.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'standalone/windows')

diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh
index 56c6fb13c..24e43bf9a 100755
--- a/standalone/windows/build.sh
+++ b/standalone/windows/build.sh
@@ -16,10 +16,9 @@ PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:/c/msysgit/cmd:/
 withcyg () {
 	PATH="$PATH:/c/cygwin/bin" "$@"
 }
-
-
-withcyg which ssh || true
-withcyg ls /usr/bin/
+withcygpreferred () {
+	PATH="/c/cygwin/bin:$PATH" "$@"
+}
 
 # This tells git-annex where to upgrade itself from.
 UPGRADE_LOCATION=http://downloads.kitenet.net/git-annex/windows/current/git-annex-installer.exe
@@ -59,7 +58,9 @@ fi
 # Build the installer
 cabal install nsis
 ghc --make Build/NullSoftInstaller.hs
-withcyg Build/NullSoftInstaller.exe
+# Want to include cygwin programs in bundle, not others, since
+# it includes the cygwin libs that go with them.
+withcygpreferred Build/NullSoftInstaller.exe
 
 rm -f last-incremental-failed
 
-- 
cgit v1.2.3