From 55125c6fd2d6d6e0c3c36c044181d09ba94a9d12 Mon Sep 17 00:00:00 2001
From: Kyle Manna <kyle@kylemanna.com>
Date: Tue, 11 Nov 2014 22:02:47 -0800
Subject: [PATCH] aosp: Don't run sudo unless necessary

* Clean-up miscellaneous things
* Allow /vol0/aosp to be overridden
* Avoid calling sudo for no reason
---
 utils/aosp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/utils/aosp b/utils/aosp
index 8ba120c..8317465 100755
--- a/utils/aosp
+++ b/utils/aosp
@@ -11,11 +11,18 @@ set -e
 AOSP_IMAGE=${AOSP_IMAGE:-kylemanna/aosp}
 AOSP_VOL=${AOSP_VOL:-/vol0}
 AOSP_ARGS=${AOSP_ARGS:---rm -it}
+AOSP_VOL_AOSP=${AOSP_VOL_AOSP:-$AOSP_VOL/aosp}
+AOSP_VOL_CCACHE=${AOSP_VOL_CCACHE:-$AOSP_VOL/ccache}
 
-sudo bash -c "mkdir -p $AOSP_VOL/{aosp,ccache} && chmod 777 $AOSP_VOL/{aosp,ccache}"
+if [ ! -d "$AOSP_VOL/aosp" -o ! -d "$AOSP_VOL/aosp" ]; then
+    sudo mkdir -p $AOSP_VOL_AOSP $AOSP_VOL_CCACHE
+    sudo chmod 777 $AOSP_VOL_AOSP $AOSP_VOL_CCACHE
+fi
 
-[ -n "$SSH_AUTH_SOCK" ] && SSH_AUTH_ARGS="-v $SSH_AUTH_SOCK:/tmp/ssh_auth -e SSH_AUTH_SOCK=/tmp/ssh_auth"
+if [ -n "$SSH_AUTH_SOCK" ]; then
+    SSH_AUTH_ARGS="-v $SSH_AUTH_SOCK:/tmp/ssh_auth -e SSH_AUTH_SOCK=/tmp/ssh_auth"
+fi
 
 docker run $AOSP_ARGS $SSH_AUTH_ARGS $AOSP_EXTRA_ARGS \
-    -v "$AOSP_VOL/aosp:/aosp" -v "$AOSP_VOL/ccache:/tmp/ccache" \
+    -v "$AOSP_VOL_AOSP:/aosp" -v "$AOSP_VOL_CCACHE:/tmp/ccache" \
     $AOSP_IMAGE $@