diff --git a/CMakeLists.txt b/CMakeLists.txt index d5a3042b3..0615e5485 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,10 +202,10 @@ if (SET_TWEAK AND EXISTS "${CMAKE_SOURCE_DIR}/.git") execute_process( COMMAND git describe --tags WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - OUTPUT_VARIABLE PROJECT_VERSION_TWEAK + OUTPUT_VARIABLE PROJECT_VERSION_GIT OUTPUT_STRIP_TRAILING_WHITESPACE ) - string(REGEX MATCH "-[0-9]+" PROJECT_VERSION_TWEAK "${PROJECT_VERSION_TWEAK}") + string(REGEX MATCH "-[0-9]+" PROJECT_VERSION_TWEAK "${PROJECT_VERSION_GIT}") endif() if(PROJECT_VERSION_TWEAK) string(REGEX MATCH "[0-9]+" PROJECT_VERSION_TWEAK_NUM "${PROJECT_VERSION_TWEAK}") diff --git a/src/detection/version/version.c b/src/detection/version/version.c index b6d6e7d77..5c1fb0ae4 100644 --- a/src/detection/version/version.c +++ b/src/detection/version/version.c @@ -44,6 +44,7 @@ FFVersionResult ffVersionResult = { .architecture = FF_ARCHITECTURE, .version = FASTFETCH_PROJECT_VERSION, .versionTweak = FASTFETCH_PROJECT_VERSION_TWEAK, + .versionGit = FASTFETCH_PROJECT_VERSION_GIT, .cmakeBuiltType = FASTFETCH_PROJECT_CMAKE_BUILD_TYPE, .compileTime = __DATE__ ", " __TIME__, .compiler = diff --git a/src/detection/version/version.h b/src/detection/version/version.h index 7bb9bd56d..272e87bc3 100644 --- a/src/detection/version/version.h +++ b/src/detection/version/version.h @@ -9,6 +9,7 @@ typedef struct FFVersionResult const char* architecture; const char* version; const char* versionTweak; + const char* versionGit; const char* cmakeBuiltType; const char* compileTime; const char* compiler; diff --git a/src/fastfetch_config.h.in b/src/fastfetch_config.h.in index 2092c91d3..6d86f3e0b 100644 --- a/src/fastfetch_config.h.in +++ b/src/fastfetch_config.h.in @@ -8,6 +8,7 @@ #define FASTFETCH_PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ #define FASTFETCH_PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@ #define FASTFETCH_PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH@ +#define FASTFETCH_PROJECT_VERSION_GIT "@PROJECT_VERSION_GIT@" #define FASTFETCH_PROJECT_VERSION_TWEAK "@PROJECT_VERSION_TWEAK@" #define FASTFETCH_PROJECT_VERSION_TWEAK_NUM @PROJECT_VERSION_TWEAK_NUM@ #define FASTFETCH_PROJECT_CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@" diff --git a/src/modules/version/version.c b/src/modules/version/version.c index 7382a97fc..f3df9f399 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -89,7 +89,7 @@ void ffGenerateVersionJsonResult(FF_MAYBE_UNUSED FFVersionOptions* options, yyjs yyjson_mut_obj_add_str(doc, obj, "sysName", result->sysName); yyjson_mut_obj_add_str(doc, obj, "architecture", result->architecture); yyjson_mut_obj_add_str(doc, obj, "version", result->version); - yyjson_mut_obj_add_str(doc, obj, "versionTweak", result->versionTweak); + yyjson_mut_obj_add_str(doc, obj, "versionGit", result->versionGit); yyjson_mut_obj_add_str(doc, obj, "cmakeBuiltType", result->cmakeBuiltType); yyjson_mut_obj_add_str(doc, obj, "compileTime", result->compileTime); yyjson_mut_obj_add_str(doc, obj, "compiler", result->compiler);