summaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-11 11:16:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-11 11:16:11 -0400
commit17e109d5c29b02be9bc83aa97afb0364c1211c56 (patch)
tree0c8f7e7d7afdc40f58427ffeba22de450e3c078a /standalone
parente40c3a0ea21a118d66c61148d8e7f689f82ea157 (diff)
try to get it to include the cygwin ssh, not the msysgit one
Diffstat (limited to 'standalone')
-rwxr-xr-xstandalone/windows/build.sh11
1 files changed, 6 insertions, 5 deletions
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