mirror of
https://github.com/kylemanna/docker-aosp
synced 2025-06-07 16:06:17 +00:00
utils/aosp: trim trailing slash of directories
This commit is contained in:
parent
d91e17da46
commit
d47f14dad0
@ -8,11 +8,16 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Override from environment
|
# Override from environment
|
||||||
|
|
||||||
AOSP_IMAGE=${AOSP_IMAGE:-kylemanna/aosp}
|
AOSP_IMAGE=${AOSP_IMAGE:-kylemanna/aosp}
|
||||||
AOSP_VOL=${AOSP_VOL:-/vol0}
|
|
||||||
AOSP_ARGS=${AOSP_ARGS:---rm -it}
|
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:-$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:-$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
|
if [ ! -d "$AOSP_VOL_AOSP" -o ! -d "$AOSP_VOL_CCACHE" ]; then
|
||||||
sudo mkdir -p $AOSP_VOL_AOSP $AOSP_VOL_CCACHE
|
sudo mkdir -p $AOSP_VOL_AOSP $AOSP_VOL_CCACHE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user