Update release.sh

This commit is contained in:
Serghei Moret 2018-07-05 14:29:54 +02:00
parent d176e69cc1
commit c82443e221
2 changed files with 8 additions and 6 deletions

View file

@ -83,10 +83,10 @@ RUN wget -nv -O noVNC.zip "https://github.com/kanaka/noVNC/archive/${NOVNC_SHA}
#====================== #======================
# Install SDK packages # Install SDK packages
#====================== #======================
ARG ANDROID_VERSION=8.0 ARG ANDROID_VERSION=5.0.1
ARG API_LEVEL=26 ARG API_LEVEL=21
ARG PROCESSOR=x86 ARG PROCESSOR=x86
ARG SYS_IMG=x86_64 ARG SYS_IMG=x86
ARG IMG_TYPE=google_apis ARG IMG_TYPE=google_apis
ARG BROWSER=android ARG BROWSER=android
ENV ANDROID_VERSION=$ANDROID_VERSION \ ENV ANDROID_VERSION=$ANDROID_VERSION \

View file

@ -10,7 +10,7 @@ else
fi fi
if [ -z "$2" ]; then if [ -z "$2" ]; then
read -p "Android version (5.0.1|5.1.1|6.0|7.0|7.1.1|all): " ANDROID_VERSION read -p "Android version (5.0.1|5.1.1|6.0|7.0|7.1.1|8.0|8.1|all): " ANDROID_VERSION
else else
ANDROID_VERSION=$2 ANDROID_VERSION=$2
fi fi
@ -33,11 +33,13 @@ declare -A list_of_levels=(
[6.0]=23 [6.0]=23
[7.0]=24 [7.0]=24
[7.1.1]=25 [7.1.1]=25
[8.0]=26
[8.1]=27
) )
declare -A list_of_processors=( declare -A list_of_processors=(
[arm]=armeabi-v7a [arm]=armeabi-v7a
[x86]=x86_64 [x86]=x86
) )
function get_android_versions() { function get_android_versions() {
@ -57,7 +59,7 @@ function get_android_versions() {
# If version cannot be found in the list # If version cannot be found in the list
if [ -z "$versions" ]; then if [ -z "$versions" ]; then
echo "Android version \"$ANDROID_VERSION\" is not found in the list or not supported! Support only version 5.0.1, 5.1.1, 6.0, 7.0, 7.1.1" echo "Android version \"$ANDROID_VERSION\" is not found in the list or not supported! Support only version 5.0.1, 5.1.1, 6.0, 7.0, 7.1.1, 8.0, 8.1"
exit 1 exit 1
fi fi