From 0734a2cd346313b870eee0a534aa798eea449887 Mon Sep 17 00:00:00 2001 From: Stanislav Kutasevits Date: Fri, 21 Mar 2025 15:55:59 +0200 Subject: [PATCH] OS-175 package version on status page --- CHANGELOG.md | 2 ++ os2forms.install | 17 +++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b72289..eb68894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa ## [Unreleased] +- Updating the display of os2forms package on the status page + ## [4.0.0] 2025-03-06 - This is an alias for for 3.22.2. Major change is the module removal, which can lead to lack of backward support. diff --git a/os2forms.install b/os2forms.install index 9bf96ab..5444428 100644 --- a/os2forms.install +++ b/os2forms.install @@ -5,6 +5,7 @@ * Install file for OS2Forms module. */ +use Composer\InstalledVersions; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\taxonomy\Entity\Term; @@ -63,21 +64,17 @@ function os2forms_requirements($phase) { 'value' => $messages, ]; - $commit_sha = exec('git rev-parse HEAD'); - $tag = exec("git describe --tags --abbrev=0"); - $remote = exec('git config --get remote.origin.url'); + $reference = InstalledVersions::getReference("os2forms/os2forms"); + $version = InstalledVersions::getPrettyVersion("os2forms/os2forms"); $version_messages = [ '#prefix' => t('OS2Forms version'), '#theme' => 'item_list', '#items' => [ - 0 => t('tag @tag (commit: @commit)', [ - '@tag' => $tag, - '@commit' => $commit_sha, - ]), - 1 => t('remote: @remote', [ - '@remote' => $remote, - ]), + 0 => t('version @version (commit: @reference)', [ + '@version' => $version, + '@reference' => $reference, + ]) ], ];