From a9627c8dfab30fae86eb1819bfbf4922dc23a5bb Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Thu, 29 Jul 2021 19:42:52 +0200 Subject: build.bash: also try BSD date syntax for converting SOURCE_DATE_EPOCH GNU date syntax does not work on macos. Fixes https://github.com/rfjakob/gocryptfs/issues/570 --- build.bash | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build.bash b/build.bash index 627a31d..7f74318 100755 --- a/build.bash +++ b/build.bash @@ -12,6 +12,9 @@ cd "$(dirname "$0")" +# $0 does not work because we may have been sourced +MYNAME=build.bash + # Make sure we have the go binary go version > /dev/null @@ -32,7 +35,7 @@ if [[ -d .git ]] ; then elif [[ -f VERSION ]] ; then GITVERSION=$(cat VERSION) else - echo "Warning: could not determine gocryptfs version" + echo "$MYNAME: warning: could not determine gocryptfs version" GITVERSION="[unknown]" fi @@ -46,7 +49,7 @@ else if [[ $FAIL -eq 0 ]]; then GITVERSIONFUSE=$OUT else - echo "Warning: could not determine go-fuse version" + echo "$MYNAME: warning: could not determine go-fuse version" GITVERSIONFUSE="[unknown]" fi fi @@ -60,7 +63,10 @@ fi # If SOURCE_DATE_EPOCH is set, it overrides BUILDDATE. This is the # standard environment variable for faking the date in reproducible builds. if [[ -n ${SOURCE_DATE_EPOCH:-} ]] ; then - BUILDDATE=$(date --utc --date="@${SOURCE_DATE_EPOCH}" +%Y-%m-%d) + if ! BUILDDATE=$(date -u --date="@${SOURCE_DATE_EPOCH}" +%Y-%m-%d) ; then + echo "$MYNAME: info: retrying with BSD date syntax..." + BUILDDATE=$(date -u -r "$SOURCE_DATE_EPOCH" +%Y-%m-%d) + fi fi # Only set GOFLAGS if it is not already set by the user -- cgit v1.2.3