improve activate script

Author: kamilsk

bin/activate

@@ -2,9 +2,9 @@
 
 deactivate () {
     if [[ -n "${_OLD_PATH:-}" ]] ; then
-        PATH="${_OLD_PATH:-}"
-        export PATH
+        export PATH="${_OLD_PATH:-}"
         unset _OLD_PATH
+        unset VAULT_ADDR
     fi
 
     if [[ -n "${BASH:-}" || -n "${ZSH_VERSION:-}" ]] ; then
@@ -30,8 +30,8 @@ up () {
 deactivate nondestructive
 
 _OLD_PATH="${PATH}"
-PATH="$(cd `dirname ${0}` && pwd):${PATH}"
-export PATH
+export PATH="$(cd `dirname ${0}` && pwd):${PATH}"
+export VAULT_ADDR=http://127.0.0.1:8200
 
 if [[ -n "${BASH:-}" || -n "${ZSH_VERSION:-}" ]] ; then
     hash -r

env/make/compose.mk

@@ -7,12 +7,12 @@ _compose = $(_base) -f env/docker/compose/docker-compose.dev.yml
 .PHONY: demo
 demo:
 	$(eval _compose = $(_base) -f env/docker/compose/docker-compose.demo.yml)
-	@(echo $(_compose))
+	@echo $(_compose)
 
 .PHONY: e2e
 e2e:
 	$(eval _compose = $(_base) -f env/docker/compose/docker-compose.e2e.yml)
-	@(echo $(_compose))
+	@echo $(_compose)
 
 .PHONY: up
 up: