From acc57bda6df2a9c480ed27549bea0bfc575fe9d2 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 4 Mar 2022 14:13:01 -0500 Subject: [PATCH] scripts: process git versions when lbmk is a worktree or submodule git worktrees have plaintext .git files which contain the gitdir in their content. --- resources/scripts/misc/versioncheck | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/scripts/misc/versioncheck b/resources/scripts/misc/versioncheck index 6c887326..e9eea929 100755 --- a/resources/scripts/misc/versioncheck +++ b/resources/scripts/misc/versioncheck @@ -24,7 +24,7 @@ if [ -f version ]; then version="$(cat version)" fi version_="${version}" -if [ -d ".git/" ]; then +if [ -e ".git" ]; then version="$(git describe --tags HEAD 2>&1)" \ || version="git-$(git rev-parse HEAD 2>&1)" \ || version="${version_}" @@ -36,7 +36,7 @@ if [ -f versiondate ]; then versiondate="$(cat versiondate)" fi versiondate_="${versiondate}" -if [ -d ".git/" ]; then +if [ -e ".git" ]; then versiondate="$(git show --no-patch --no-notes --pretty='%ct' HEAD)" \ || versiondate="${versiondate_}" printf "%s\n" "${versiondate}" > versiondate