From cfda1cdb10e7466330b76f45e5ccd34d7a562533 Mon Sep 17 00:00:00 2001 From: Zeckmathederg Date: Sat, 12 Oct 2024 03:14:11 -0600 Subject: [PATCH] Adjusted book info. Adjusted my email in general.ent. Also adjusted how the book version is generated. --- general.ent | 2 +- git-version.sh | 4 ++-- introduction/welcome/changelog.xml | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/general.ent b/general.ent index 376b42ccde..27785cb442 100644 --- a/general.ent +++ b/general.ent @@ -55,7 +55,7 @@ - + diff --git a/git-version.sh b/git-version.sh index 06cfaff567..95994a84a6 100755 --- a/git-version.sh +++ b/git-version.sh @@ -44,8 +44,8 @@ esac full_date="$month $day$suffix, $year" -sha="$(git describe --abbrev=1 --always)" -version=$(echo "$sha" | sed 's/-g[^-]*$//') +sha="$(git describe --abbrev=1 --always --exclude '*')" +version=$(echo -n "#" && echo -n "$sha") if [ "$(git diff HEAD | wc -l)" != "0" ]; then version="$version" diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index c7f28e65d9..48872d02a0 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,9 @@ October 12th, 2024 + + [Zeckmathederg] - Adjusted book info. + [Zeckmathederg] - Vulkan-{Headers,Tools}: 1.3.297 -> 1.3.298.