Skip to content

Commit

Permalink
Cleanup up custom_deps/run.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemarshall committed Oct 9, 2018
1 parent 88eeb1d commit d2b7d79
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions custom_deps/run.sh
Expand Up @@ -3,8 +3,8 @@ set -e

CONFIG_PATH=/data/options.json

PYPI="$(jq --raw-output '.pypi | join(" ")' $CONFIG_PATH)"
APK="$(jq --raw-output '.apk | join(" ") // empty' $CONFIG_PATH)"
PYPI="$(jq --raw-output '.pypi | join(" ")' ${CONFIG_PATH})"
APK="$(jq --raw-output '.apk | join(" ") // empty' ${CONFIG_PATH})"

# Cleanup old deps
echo "[Info] Remove old deps"
Expand All @@ -13,7 +13,7 @@ rm -rf /config/deps/*
# Need custom apk for build?
if [ -n "$APK" ]; then
echo "[Info] Install apks for build"
if ! ERROR="$(apk add --no-cache "${APK[@]}")"; then
if ! ERROR="$(apk add --no-cache ${APK})"; then
echo "[Error] Can't install packages!"
echo "$ERROR" && exit 1
fi
Expand All @@ -24,7 +24,7 @@ echo "[Info] Install pypi modules into deps"
export PYTHONUSERBASE=/config/deps

# shellcheck disable=SC2086
if ! ERROR="$(pip3 install --user --no-cache-dir --prefix= --no-dependencies $PYPI)"; then
if ! ERROR="$(pip3 install --user --no-cache-dir --prefix= --no-dependencies ${PYPI})"; then
echo "[Error] Can't install PyPI packages!"
echo "$ERROR" && exit 1
fi
Expand Down

0 comments on commit d2b7d79

Please sign in to comment.