diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-05-07 15:56:40 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-07 15:56:40 -0400 |
| commit | 18fc05ff04cc4c189b7cb821d1e3ae3cf4284123 (patch) | |
| tree | 0a12683720bc0023a254b8893ec2613dd2a8c980 /standalone | |
| parent | ce285ea6fa4469fab861667fde7b3f60526ca94f (diff) | |
Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin.
Diffstat (limited to 'standalone')
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index ef990004c3..0eb06c8efd 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -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 |