From c76c044246b13457e00a82c7fd9550e061b4b406 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 23 Sep 2013 10:25:21 -0400 Subject: fix cd --- standalone/android/buildchroot-inchroot-asuser | 3 +++ standalone/android/install-haskell-packages | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'standalone') diff --git a/standalone/android/buildchroot-inchroot-asuser b/standalone/android/buildchroot-inchroot-asuser index 0e75a293a..fbd6cc1bf 100755 --- a/standalone/android/buildchroot-inchroot-asuser +++ b/standalone/android/buildchroot-inchroot-asuser @@ -13,6 +13,9 @@ cd ghc-android git checkout stable-ghc-snapshot ./build +# This saves 2 gb, and the same sources are in build-*/ghc +rm -rf stage0 + # Set up android SDK where the git-annex android Makefile # expects to find it. cd .. diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index 0bf7e960f..f875ca9eb 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -46,7 +46,7 @@ patched () { } installgitannexdeps () { - pushd ../../.. + pushd ../.. echo cabal install --only-dependencies cabal install --only-dependencies "$@" popd @@ -96,10 +96,9 @@ install_pkgs () { patched gnuidn patched DAV - installgitannexdeps -fAndroid -f-Pairing - cd .. - rm -rf tmp + + installgitannexdeps -fAndroid -f-Pairing } echo -- cgit v1.2.3