cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplify the selection of date command

Browse source 
- use egrep patterns to detect BSDs in one ifeq
- use seconds-since-epoch as input for BSD date (-r option)
- get seconds-since-epoch from git log with "%at" format string
This commit is contained in:
r-p-e 2013-09-15 21:27:18 +02:00
parent f93ef96a08
commit 338ecdd578
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -39,15 +39,11 @@ ifneq ($(shell which git),)
GIT_DATE := $(shell git log -n 1 --format="%ai") GIT_DATE := $(shell git log -n 1 --format="%ai")
endif endif
ifeq ($(OS), FreeBSD) ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD'),1)
DATE := $(shell date -j -f "%Y-%m-%d %H:%M:%s" "$(GIT_DATE)" +%Y%m%d%H%M) DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M)
else
ifeq ($(OS), Darwin)
DATE := $(shell date -j -f "%Y-%m-%d %H:%M:%S" "$(GIT_DATE)" +%Y%m%d%H%M)
else else
DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M) DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
endif endif
endif
# RPM build parameters # RPM build parameters
RPMSPECDIR= packaging/rpm RPMSPECDIR= packaging/rpm