From d47f14dad09159447ef5e51e5b1f0046901a6c9a Mon Sep 17 00:00:00 2001
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Date: Tue, 19 Apr 2016 13:38:02 -0400
Subject: [PATCH] utils/aosp: trim trailing slash of directories

---
 utils/aosp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/utils/aosp b/utils/aosp
index eefa446..965c1f8 100755
--- a/utils/aosp
+++ b/utils/aosp
@@ -8,11 +8,16 @@
 set -e
 
 # Override from environment
+
 AOSP_IMAGE=${AOSP_IMAGE:-kylemanna/aosp}
-AOSP_VOL=${AOSP_VOL:-/vol0}
 AOSP_ARGS=${AOSP_ARGS:---rm -it}
+
+AOSP_VOL=${AOSP_VOL:-/vol0}
+AOSP_VOL=${AOSP_VOL%/} # Trim trailing slash if needed
 AOSP_VOL_AOSP=${AOSP_VOL_AOSP:-$AOSP_VOL/aosp}
+AOSP_VOL_AOSP=${AOSP_VOL_AOSP%/} # Trim trailing slash if needed
 AOSP_VOL_CCACHE=${AOSP_VOL_CCACHE:-$AOSP_VOL/ccache}
+AOSP_VOL_CCACHE=${AOSP_VOL_CCACHE%/} # Trim trailing slash if needed
 
 if [ ! -d "$AOSP_VOL_AOSP" -o ! -d "$AOSP_VOL_CCACHE" ]; then
     sudo mkdir -p $AOSP_VOL_AOSP $AOSP_VOL_CCACHE