Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin.

This commit is contained in:
Joey Hess 2015-05-07 15:56:40 -04:00
parent ce285ea6fa
commit 18fc05ff04
3 changed files with 8 additions and 5 deletions

View file

@ -16,9 +16,6 @@ PATH="/c/Program Files (x86)/NSIS:/c/msysgit/cmd:/c/msysgit/bin:$PATH"
withcyg () {
PATH="$PATH:/c/cygwin/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
@ -70,7 +67,11 @@ cabal install nsis
ghc -fforce-recomp --make Build/NullSoftInstaller.hs
# Want to include cygwin programs in bundle, not others, since
# it includes the cygwin libs that go with them.
withcygpreferred Build/NullSoftInstaller.exe
# Currently need an older version of rsync than the one from cygwin.
if [ ! -e rsync.exe ]; then
wget https://downloads.kitenet.net/git-annex/windows/assets/rsync.exe
fi
PATH=".:/c/cygwin/bin:$PATH" withcygpreferred Build/NullSoftInstaller.exe
rm -f last-incremental-failed