idempotency fixes

2014-04-04 19:07:53 -04:00 · 2014-04-04 19:07:53 -04:00 · 0d965885b7
commit 0d965885b7
parent 15dc2e950b
2 changed files with 2 additions and 2 deletions
--- 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
--- 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