fix for build arg

evovetech · Jul 20, 2018 · 861c66c · 861c66c
1 parent 9d3d94b
commit 861c66c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,5 +26,5 @@ COPY tools .
 ENTRYPOINT ["./entrypoint.sh"]
 
 # Update sdk on build
-ONBUILD ARG INSTALL_PACKAGES_FILE=default-packages.txt
-ONBUILD RUN ./install.sh ${INSTALL_PACKAGES_FILE}
+ONBUILD ARG INSTALL_PACKAGE_LIST=""
+ONBUILD RUN ./install.sh "${INSTALL_PACKAGE_LIST}"
diff --git a/images/sdk/tools/env.sh b/images/sdk/tools/env.sh
@@ -36,22 +36,27 @@ function android_update() {
     android_sdkmanager "--update --verbose"
 }
 
+function android_install_packages() {
+    while [[ $# -gt 0 ]]; do
+      local pkg="$1"
+      shift 1
+      echo "Installing package: ${pkg}"
+      android_sdkmanager "${pkg} --verbose"
+    done
+}
+
 function android_install() {
     if [[ $# -eq 0 ]]; then
         help
         return 1
     fi
 
-    echo "Installing packages"
     local prev_ifs="$IFS"
     IFS=$'\n'
     local pkgs=($( cat "$@" ))
     IFS="${prev_ifs}"
 
-    local pkg
-    for pkg in "${pkgs[@]}"; do
-      android_sdkmanager "${pkg} --verbose"
-    done
+    android_install_packages "${pkgs[@]}"
 }
 
 export -f help

diff --git a/tools/install.sh b/tools/install.sh
@@ -2,5 +2,11 @@
 
 source "${ANDROID_ROOT}/tools/env.sh"
 
-echo "Installing packages"
-android_install "${@}"
+if [[ -n "$1" ]]; then
+  pkgs=("$@")
+  echo "Installing packages: ${pkgs[@]}"
+  android_install_packages "${pkgs[@]}"
+else
+  echo "Installing default packages"
+  android_install default-packages.txt
+fi