Merge branch 'submodule-version' of xloem/lbmk into master

This commit is contained in:
Leah Rowe 2022-03-06 17:07:33 +00:00 committed by Gogs
commit 89aac5393a
1 changed files with 2 additions and 2 deletions

View File

@ -24,7 +24,7 @@ if [ -f version ]; then
version="$(cat version)" version="$(cat version)"
fi fi
version_="${version}" version_="${version}"
if [ -d ".git/" ]; then if [ -e ".git" ]; then
version="$(git describe --tags HEAD 2>&1)" \ version="$(git describe --tags HEAD 2>&1)" \
|| version="git-$(git rev-parse HEAD 2>&1)" \ || version="git-$(git rev-parse HEAD 2>&1)" \
|| version="${version_}" || version="${version_}"
@ -36,7 +36,7 @@ if [ -f versiondate ]; then
versiondate="$(cat versiondate)" versiondate="$(cat versiondate)"
fi fi
versiondate_="${versiondate}" versiondate_="${versiondate}"
if [ -d ".git/" ]; then if [ -e ".git" ]; then
versiondate="$(git show --no-patch --no-notes --pretty='%ct' HEAD)" \ versiondate="$(git show --no-patch --no-notes --pretty='%ct' HEAD)" \
|| versiondate="${versiondate_}" || versiondate="${versiondate_}"
printf "%s\n" "${versiondate}" > versiondate printf "%s\n" "${versiondate}" > versiondate