fix(modules/git/bootstrap): remove lazy assignments (#335)

* fix(modules/git/bootstrap): remove lazy assignments * Auto Format * fix(modules/git/bootstrap): adjust GIT_URL to use GIT var Co-authored-by: cloudpossebot <[email protected]>
cloudposse · Jan 13, 2023 · d2c469b · d2c469b
1 parent 72ee8e2
commit d2c469b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -502,7 +502,7 @@ In general, PRs are welcome. We follow the typical "fork-and-pull" Git workflow.
 
 ## Copyrights
 
-Copyright © 2016-2022-2022 [Cloud Posse, LLC](https://cloudposse.com)
+Copyright © 2016-2022-2023 [Cloud Posse, LLC](https://cloudposse.com)
 
 
 

diff --git a/modules/git/bootstrap.Makefile b/modules/git/bootstrap.Makefile
@@ -4,28 +4,28 @@ ifeq ($(wildcard .git),)
   endif
 else
 
-GIT ?= $(shell which git)
+GIT := $(shell which git)
 
-export GIT_COMMIT ?= $(shell $(GIT) rev-parse --verify HEAD 2>/dev/null)
-export GIT_COMMIT_SHORT ?= $(shell $(GIT) rev-parse --verify --short HEAD 2>/dev/null)
-export GIT_BRANCH ?= $(shell $(GIT) rev-parse --abbrev-ref HEAD 2>/dev/null)
-export GIT_TAG ?= $(shell $(GIT) tag -l --sort -taggerdate --points-at HEAD 2>/dev/null | head -n 1)
-export GIT_COMMIT_URL ?= $(shell $(GIT) config --get remote.origin.url 2>/dev/null | sed 's/\.git$$//g' | sed 's/git@\(.*\):/https:\/\/\1\//g' )/commit/$(GIT_COMMIT_SHORT)
+export GIT_COMMIT := $(shell $(GIT) rev-parse --verify HEAD 2>/dev/null)
+export GIT_COMMIT_SHORT := $(shell $(GIT) rev-parse --verify --short HEAD 2>/dev/null)
+export GIT_BRANCH := $(shell $(GIT) rev-parse --abbrev-ref HEAD 2>/dev/null)
+export GIT_TAG := $(shell $(GIT) tag -l --sort -taggerdate --points-at HEAD 2>/dev/null | head -n 1)
+export GIT_COMMIT_URL := $(shell $(GIT) config --get remote.origin.url 2>/dev/null | sed 's/\.git$$//g' | sed 's/git@\(.*\):/https:\/\/\1\//g' )/commit/$(GIT_COMMIT_SHORT)
 
-export GIT_COMMIT_MESSAGE ?= $(shell $(GIT) show -s --format=%s%b 2>/dev/null)
-export GIT_COMMIT_AUTHOR ?= $(shell $(GIT) show -s --format=%aN 2>/dev/null)
-export GIT_COMMIT_TIMESTAMP ?= $(shell $(GIT) log -1 --format=%ct 2>/dev/null)
+export GIT_COMMIT_MESSAGE := $(shell $(GIT) show -s --format=%s%b 2>/dev/null)
+export GIT_COMMIT_AUTHOR := $(shell $(GIT) show -s --format=%aN 2>/dev/null)
+export GIT_COMMIT_TIMESTAMP := $(shell $(GIT) log -1 --format=%ct 2>/dev/null)
 
 
 ## GIT_TIMESTAMP is deprecated. Use GIT_COMMIT_TIMESTAMP instead
-export GIT_TIMESTAMP ?= $(shell $(GIT) log -1 --format=%ct 2>/dev/null)
+export GIT_TIMESTAMP := $(shell $(GIT) log -1 --format=%ct 2>/dev/null)
 
 ifeq ($(GIT_TAG),)
   export GIT_IS_TAG := 0
-  export GIT_BRANCH_TAG ?= $(GIT_BRANCH)
+  export GIT_BRANCH_TAG := $(GIT_BRANCH)
 else
   export GIT_IS_TAG := 1
-  export GIT_BRANCH_TAG ?= $(GIT_TAG)
+  export GIT_BRANCH_TAG := $(GIT_TAG)
 endif
 
 ifeq ($(GIT_BRANCH),)
@@ -34,8 +34,8 @@ else
   export GIT_IS_BRANCH := 1
 endif
 
-export GIT_URL ?= $(shell git remote get-url origin 2>/dev/null)
-export GIT_REPO ?= $(shell basename "$(GIT_URL)" .git)
-export GIT_ORG ?= $(shell basename $$(dirname "$(GIT_URL)" | cut -d: -f2))
+export GIT_URL := $(shell $(GIT) remote get-url origin 2>/dev/null)
+export GIT_REPO := $(shell basename "$(GIT_URL)" .git)
+export GIT_ORG := $(shell basename $$(dirname "$(GIT_URL)" | cut -d: -f2))
 
 endif