summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-09 16:09:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-09 16:09:43 -0400
commitc65e1f30560e064ecdbebe28ae493007819b6649 (patch)
tree94a2d472fd3b5abe7605d225c9f303691e28d0ea
parent4ea8397342f51bd5e41376eeddae2dfbcbc8ca0e (diff)
bugfix
-rwxr-xr-xstandalone/android/install-haskell-packages12
1 files changed, 4 insertions, 8 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index 4e3afae64..f9b34acb3 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -45,22 +45,18 @@ patched () {
}
unpatched () {
- if [ "$native" ]; then
- cabalinstall "$@"
- else
- cabalinstall "$@"
- fi
+ cabalinstall "$@"
}
onlycross () {
if [ ! "$native" ]; then
- eval $@
+ eval "$@"
fi
}
onlynative () {
if [ "$native" ]; then
- eval $@
+ eval "$@"
fi
}
@@ -153,7 +149,7 @@ install_pkgs () {
patched yesod-static 1.1.2
unpatched ifelse-0.85
unpatched SafeSemaphore-0.9.0
- onlycross unpatched bloomfilter-1.2.6.10 --constraint 'bytestring >= 0.10.3.0'
+ if [ ! "$native" ]; then cabal install bloomfilter-1.2.6.10 --constraint 'bytestring >= 0.10.3.0'; fi
onlynative unpatched bloomfilter-1.2.6.10
unpatched edit-distance-0.2.1.2
unpatched uuid-1.2.12