Skip to content

Commit

Permalink
Merge pull request #2 from wasosa/avoid-bashisms-in-makefile
Browse files Browse the repository at this point in the history
Avoid bashism in makefiles for the sake of systems where /bin/sh is t…
  • Loading branch information
m110 authored Jul 29, 2020
2 parents 34c74e9 + 6ddb8f9 commit ebe2ed7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions terraform/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
base_image:=gcr.io/cloudrun/hello
load_envs:=source ./.env
load_envs:=. ./.env

all: check init apply push_repo done

Expand All @@ -19,7 +19,7 @@ apply:

.PHONY: push_repo
push_repo:
git config --global credential.https://source.developers.google.com.helper gcloud.sh
git config --global credential.https://source.developers.google.com.helper gcloud.sh
repo_url=$(shell terraform output -no-color | grep repo_url | awk '{print $$3}') && \
if [ -z "$(shell git remote | grep google)" ]; then \
git remote add google "$$repo_url"; \
Expand Down

0 comments on commit ebe2ed7

Please sign in to comment.