mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

try to get it to include the cygwin ssh, not the msysgit one

Browse source
This commit is contained in:
Joey Hess 2013-12-11 11:16:11 -04:00
parent 63bd83458c
commit a319f17220
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
standalone/windows/build.sh
View file

@ -16,10 +16,9 @@ PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:/c/msysgit/cmd:/
withcyg () { withcyg () {
PATH="$PATH:/c/cygwin/bin" "$@" PATH="$PATH:/c/cygwin/bin" "$@"
} }
withcygpreferred () {
PATH="/c/cygwin/bin:$PATH" "$@"
withcyg which ssh || true }
withcyg ls /usr/bin/
# This tells git-annex where to upgrade itself from. # This tells git-annex where to upgrade itself from.
UPGRADE_LOCATION=http://downloads.kitenet.net/git-annex/windows/current/git-annex-installer.exe UPGRADE_LOCATION=http://downloads.kitenet.net/git-annex/windows/current/git-annex-installer.exe
@ -59,7 +58,9 @@ fi
# Build the installer # Build the installer
cabal install nsis cabal install nsis
ghc --make Build/NullSoftInstaller.hs 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 rm -f last-incremental-failed