summaryrefslogtreecommitdiff
path: root/standalone/android
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-04 19:07:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-04 19:07:53 -0400
commit9c911c95b88d5ec3054903a03f49b72436404dad (patch)
treecfe5f24ce88b16485698cc053884941ef91f7bbc /standalone/android
parentaa46268ec1ce73c934bd19e54def9ef57d050483 (diff)
idempotency fixes
Diffstat (limited to 'standalone/android')
-rwxr-xr-xstandalone/android/buildchroot-inchroot2
-rwxr-xr-xstandalone/android/buildchroot-inchroot-asuser2
2 files changed, 2 insertions, 2 deletions
diff --git a/standalone/android/buildchroot-inchroot b/standalone/android/buildchroot-inchroot
index 00a8fa68b..9d2cddff3 100755
--- a/standalone/android/buildchroot-inchroot
+++ b/standalone/android/buildchroot-inchroot
@@ -22,5 +22,5 @@ apt-get clean
wget http://snapshot.debian.org/archive/debian/20130903T155330Z/pool/main/a/automake-1.14/automake_1.14-1_all.deb
dpkg -i automake*.deb
rm *.deb
-useradd builder --create-home ||
+useradd builder --create-home || true
su builder -c $0-asuser
diff --git a/standalone/android/buildchroot-inchroot-asuser b/standalone/android/buildchroot-inchroot-asuser
index 710e76e46..faf8cbc02 100755
--- a/standalone/android/buildchroot-inchroot-asuser
+++ b/standalone/android/buildchroot-inchroot-asuser
@@ -3,7 +3,7 @@
set -e
cd
-rm -rf .ghc .cabal
+rm -rf .ghc .cabal .android
cabal update
cabal install happy alex --bindir=$HOME/bin
PATH=$HOME/bin:$PATH