From a20084d9069373fc33d959110147d73f10f5cc4e Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Tue, 23 Aug 2016 10:23:18 -0300 Subject: [PATCH] Fix proxies assignment in Makefile --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6332a546..53d9799d 100644 --- a/Makefile +++ b/Makefile @@ -85,17 +85,17 @@ DOCKERD_PROXY=tools/dind/config/services/docker.service.d/proxy.conf ${DOCKERD_PROXY}: rm -f ${DOCKERD_PROXY} if [ -n "${rt_http_proxy}" ]; then \ - proxies=("\"HTTP_PROXY=${rt_http_proxy}\""); \ - proxies=($${proxies[*]} "\"http_proxy=${rt_http_proxy}\""); \ + proxies="\"HTTP_PROXY=${rt_http_proxy}\""; \ + proxies="$${proxies[*]} \"http_proxy=${rt_http_proxy}\""; \ fi; \ if [ -n "${rt_https_proxy}" ]; then \ - proxies=($${proxies[*]} "\"HTTPS_PROXY=${rt_https_proxy}\""); \ - proxies=($${proxies[*]} "\"https_proxy=${rt_https_proxy}\""); \ + proxies="$${proxies[*]} \"HTTPS_PROXY=${rt_https_proxy}\""; \ + proxies="$${proxies[*]} \"https_proxy=${rt_https_proxy}\""; \ fi; \ if [ -n "${rt_no_proxy}" ]; then \ - proxies=($${proxies[*]} "\"no_proxy=${rt_no_proxy}\""); \ + proxies="$${proxies[*]} \"no_proxy=${rt_no_proxy}\""; \ fi; \ - if [ -n "$${proxies[*]}" ]; then \ + if [ -n "${proxies}" ]; then \ echo "[Service]" > ${DOCKERD_PROXY}; \ echo "Environment=$${proxies[*]}" >> ${DOCKERD_PROXY}; \ else \