From d87a6f877ce82d8a585a177cd8c75e85ce8b1fe9 Mon Sep 17 00:00:00 2001
From: Julian Labus <julian@labus-online.de>
Date: Thu, 14 Mar 2019 15:35:47 +0100
Subject: [PATCH] Roles: use environment instead of passing variable in shell
 command

---
 roles/golang/tasks/main.yml             | 4 +++-
 roles/service-cpthook/tasks/main.yml    | 4 +++-
 roles/service-fastd-mesh/tasks/main.yml | 4 +++-
 roles/service-yanic/tasks/main.yml      | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/roles/golang/tasks/main.yml b/roles/golang/tasks/main.yml
index a7f3d69..cc286d0 100644
--- a/roles/golang/tasks/main.yml
+++ b/roles/golang/tasks/main.yml
@@ -22,4 +22,6 @@
     mode: 0644
 
 - name: build dep util
-  shell: "GOPATH={{ gopath }} go get -v -u github.com/golang/dep/cmd/dep"
+  shell: "go get -v -u github.com/golang/dep/cmd/dep"
+  environment:
+    GOPATH: "{{ gopath }}"
diff --git a/roles/service-cpthook/tasks/main.yml b/roles/service-cpthook/tasks/main.yml
index e9f229f..c12a447 100644
--- a/roles/service-cpthook/tasks/main.yml
+++ b/roles/service-cpthook/tasks/main.yml
@@ -12,7 +12,9 @@
   notify: reload systemd
 
 - name: build cpthook binary
-  shell: 'GOPATH={{ gopath }} go get -u {{ cpthook_src }}'
+  shell: 'go get -u {{ cpthook_src }}'
+  environment:
+    GOPATH: "{{ gopath }}"
   notify: restart cpthook
 
 - name: configure cpthook systemd unit
diff --git a/roles/service-fastd-mesh/tasks/main.yml b/roles/service-fastd-mesh/tasks/main.yml
index 998ea56..6809ba0 100644
--- a/roles/service-fastd-mesh/tasks/main.yml
+++ b/roles/service-fastd-mesh/tasks/main.yml
@@ -98,7 +98,9 @@
   loop: "{{ meshes | subelements('fastd.nodes.instances') }}"
 
 - name: build fastd-exporter binary
-  shell: "GOPATH={{ gopath }} go get -v -u github.com/freifunk-darmstadt/fastd-exporter"
+  shell: "go get -v -u github.com/freifunk-darmstadt/fastd-exporter"
+  environment:
+    GOPATH: "{{ gopath }}"
   notify: restart fastd-exporter
 
 - name: copy vhost fastd_exporter.conf
diff --git a/roles/service-yanic/tasks/main.yml b/roles/service-yanic/tasks/main.yml
index 68ee1f0..3246e4a 100644
--- a/roles/service-yanic/tasks/main.yml
+++ b/roles/service-yanic/tasks/main.yml
@@ -45,10 +45,14 @@
     force: true
 
 - name: get required library versions
-  shell: "cd {{ gopath }}/src/{{ yanic_src }} && GOPATH={{ gopath }} {{ gopath }}/bin/dep ensure"
+  shell: "cd {{ gopath }}/src/{{ yanic_src }} && {{ gopath }}/bin/dep ensure"
+  environment:
+    GOPATH: "{{ gopath }}"
 
 - name: build Yanic binary
-  shell: 'GOPATH={{ gopath }} go install {{ gopath }}/src/{{ yanic_src }}'
+  shell: 'go install {{ gopath }}/src/{{ yanic_src }}'
+  environment:
+    GOPATH: "{{ gopath }}"
   notify: restart yanic
 
 - name: configure Yanic systemd unit