From b15a0d7dbe97abf59070f15773c24b165ff566cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Fri, 15 Jun 2018 11:39:19 +0200 Subject: [PATCH] Fix problems with echo and newlines printf is more portable --- .makefiles/git.mk | 2 +- .makefiles/k8s.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.makefiles/git.mk b/.makefiles/git.mk index 836eb14..ac5eaad 100644 --- a/.makefiles/git.mk +++ b/.makefiles/git.mk @@ -14,7 +14,7 @@ push-github: ## Push the code to github. You need to set up GITHUB_DEPLOY_KEY ifeq ($(GITHUB_DEPLOY_KEY),) else $(eval KEY_FILE := "$(shell mktemp)") - @echo "$(GITHUB_DEPLOY_KEY)" > $(KEY_FILE) + @printf '%b' '$(GITHUB_DEPLOY_KEY)' > $(KEY_FILE) @git remote rm github-deploy || true git remote add github-deploy $(GITHUB_REPO) -@GIT_SSH_COMMAND="ssh -i $(KEY_FILE)" git fetch github-deploy $(CI_COMMIT_REF_NAME) diff --git a/.makefiles/k8s.mk b/.makefiles/k8s.mk index a493b4a..4c6f760 100644 --- a/.makefiles/k8s.mk +++ b/.makefiles/k8s.mk @@ -13,7 +13,7 @@ KUBE_CA_TEMP=false ifndef KUBE_CA_PEM_FILE KUBE_CA_PEM_FILE:=$$PWD/.ca.crt -CREATED:=$(shell echo -e "$(KUBE_CA_BUNDLE)" > $(KUBE_CA_PEM_FILE)) +CREATED:=$(shell printf '%b\n' '$(KUBE_CA_BUNDLE)' > $(KUBE_CA_PEM_FILE)) endif KUBE_TOKEN?="" KUBE_NAMESPACE?=$(NAME)