diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ff45325d7..ec773d0a4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -84,7 +84,7 @@ jobs: - name: Get fastfetch version id: get_version_fastfetch - run: echo "::set-output name=release::$(./fastfetch --version)" + run: echo "::set-output name=release::$(./fastfetch --version-raw)" - name: Get latest release version id: get_version_release diff --git a/CMakeLists.txt b/CMakeLists.txt index 234d3d40f..f67963eff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,10 @@ project(fastfetch LANGUAGES C ) +#e.g. -alpha or -beta or +1 +#This allows to track builds between versions, without GitHub creating a new release +set(PROJECT_VERSION_EXTRA "+1") + include(GNUInstallDirs) OPTION(ENABLE_LIBPCI "Enable libpci" ON) diff --git a/packaging/deb/create.sh b/packaging/deb/create.sh index 2314ca808..b1d44ab8c 100755 --- a/packaging/deb/create.sh +++ b/packaging/deb/create.sh @@ -22,7 +22,7 @@ fi # Populate the files cmake --install "${BUILD_DIR}" --prefix "${PACKAGE_DIR}/usr" || exit 5 mkdir -p "${PACKAGE_DIR}/DEBIAN" || exit 6 -sed "s//$("${BUILD_DIR}/fastfetch" --version)/g" "${ROOT_DIR}/packaging/deb/control-template" > "${PACKAGE_DIR}/DEBIAN/control" || exit 7 +sed "s//$("${BUILD_DIR}/fastfetch" --version-raw)/g" "${ROOT_DIR}/packaging/deb/control-template" > "${PACKAGE_DIR}/DEBIAN/control" || exit 7 # Create the package dpkg-deb --build "${PACKAGE_DIR}" || exit 8 diff --git a/src/fastfetch.c b/src/fastfetch.c index 78a3db22a..36a945020 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -612,6 +612,11 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con exit(0); } else if(strcasecmp(key, "-v") == 0 || strcasecmp(key, "--version") == 0) + { + puts("fastfetch "FASTFETCH_PROJECT_VERSION""FASTFETCH_PROJECT_VERSION_EXTRA); + exit(0); + } + else if(strcasecmp(key, "--version-raw") == 0) { puts(FASTFETCH_PROJECT_VERSION); exit(0); diff --git a/src/fastfetch_config.h.in b/src/fastfetch_config.h.in index bece0832e..3453cc4ec 100644 --- a/src/fastfetch_config.h.in +++ b/src/fastfetch_config.h.in @@ -4,6 +4,7 @@ #define FASTFETCH_PROJECT_NAME "@PROJECT_NAME@" #define FASTFETCH_PROJECT_VERSION "@PROJECT_VERSION@" #define FASTFETCH_PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ +#define FASTFETCH_PROJECT_VERSION_EXTRA "@PROJECT_VERSION_EXTRA@" #define FASTFETCH_DATATEXT_STRUCTURE "@DATATEXT_STRUCTURE@" #define FASTFETCH_DATATEXT_CONFIG "@DATATEXT_CONFIG@" //Requires FASTFETCH_PROJECT_VERSION and FASTFETCH_DATATEXT_STRUCTURE to be set