From c0410a8d59e275f30a4f1aa54aca9d9320f5c19e Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Wed, 11 Jul 2018 14:16:59 +0200
Subject: [PATCH] Fix array to pipy (#354)

* Fix array to pipy

* Update CHANGELOG.md

* Update run.sh
---
 custom_deps/CHANGELOG.md | 3 +++
 custom_deps/config.json  | 2 +-
 custom_deps/run.sh       | 8 +++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/custom_deps/CHANGELOG.md b/custom_deps/CHANGELOG.md
index e06983b..b80a871 100644
--- a/custom_deps/CHANGELOG.md
+++ b/custom_deps/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.3
+- Bugfix multible pip packages
+
 ## 0.2
 - Bugfix pip prefix settings
 
diff --git a/custom_deps/config.json b/custom_deps/config.json
index 545a12d..51ad8e6 100644
--- a/custom_deps/config.json
+++ b/custom_deps/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Custom deps deployment",
-  "version": "0.2",
+  "version": "0.3",
   "slug": "custom_deps",
   "description": "Manage custom python modules in Home Assistant deps",
   "url": "https://home-assistant.io/addons/custom_deps/",
diff --git a/custom_deps/run.sh b/custom_deps/run.sh
index a5447db..9661b84 100644
--- a/custom_deps/run.sh
+++ b/custom_deps/run.sh
@@ -3,8 +3,8 @@ set -e
 
 CONFIG_PATH=/data/options.json
 
-PYPI=$(jq --raw-output ".pypi[]" $CONFIG_PATH)
-APK=$(jq --raw-output ".apk[] // 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"
@@ -22,7 +22,9 @@ fi
 # Install pypi modules
 echo "[Info] Install pypi modules into deps"
 export PYTHONUSERBASE=/config/deps
-if ! ERROR="$(pip3 install --user --no-cache-dir --prefix= --no-dependencies "${PYPI[@]}")"; then
+
+# shellcheck disable=SC2086
+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