summaryrefslogtreecommitdiff
path: root/standalone/windows/build-simple.sh
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-09-11 12:32:00 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-09-11 12:44:27 -0400
commitaede78869b2d9daa0c5e5d3f01824824e8d28ae4 (patch)
tree0af07682e60e948787b55962b1e63ae5b5476825 /standalone/windows/build-simple.sh
parent2aedcb351349cd2b5c65fff0c7207e5f510798ba (diff)
get git-annex working even if user doesn't add git to path
This is pretty complicated, but I have both "git-annex" and "git annex" working both in the git bash shell even with git not added to path. And, when git's added to path, both work from MS-DOS prompt window too. I think that the webapp startup does still need git in path, so instructions will keep saying to do that. But, users often disregard them, and hopefully this will reduce support traffic. Also, switched the wget from the cygwin one to the msys2 one, avoiding the complication of needing to bundle any cygwin dlls.
Diffstat (limited to 'standalone/windows/build-simple.sh')
-rwxr-xr-xstandalone/windows/build-simple.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/standalone/windows/build-simple.sh b/standalone/windows/build-simple.sh
index 7e0f40bab..65be71271 100755
--- a/standalone/windows/build-simple.sh
+++ b/standalone/windows/build-simple.sh
@@ -35,7 +35,4 @@ fi
# Build the installer
cabal install nsis
ghc --make Build/NullSoftInstaller.hs -fno-warn-tabs
-PATH="$PATH:/cygdrive/c/Program Files/NSIS"
-# Want to include cygwin programs in bundle, not others, since
-# it includes the cygwin libs that go with them.
-withcygpreferred Build/NullSoftInstaller.exe
+PATH="$PATH:/cygdrive/c/Program Files/NSIS" Build/NullSoftInstaller.exe