Version output include extra info

Author: LinusDierheimer

.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

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)

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/<VERSION>/$("${BUILD_DIR}/fastfetch" --version)/g" "${ROOT_DIR}/packaging/deb/control-template" > "${PACKAGE_DIR}/DEBIAN/control" || exit 7
+sed "s/<VERSION>/$("${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

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);

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