diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-09 16:23:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-09 16:23:18 -0400 |
| commit | 2676a0e50c3cd7275809857a2ee6ac00c1c27ca4 (patch) | |
| tree | 3c2d8589eb789ed50319076f7f4c5fffebedf125 | |
| parent | 3e4b63c6b2786d1bc551e448fe12713bb8999af3 (diff) | |
| parent | c65e1f30560e064ecdbebe28ae493007819b6649 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rwxr-xr-x | standalone/android/install-haskell-packages | 12 |
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 |