Merge pull request #649 from fastfetch-cli/dev

Release v2.3.2

.github/workflows/ci.yml

@@ -152,9 +152,8 @@ jobs:
 
       - name: install required packages
         run: |
-          brew uninstall aws-sam-cli azure-cli qemu lima colima gradle kotlin maven pipx aria2 || true
           brew update
-          brew install vulkan-loader vulkan-headers molten-vk imagemagick chafa
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install vulkan-loader vulkan-headers molten-vk imagemagick chafa
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

CHANGELOG.md

@@ -1,5 +1,20 @@
+# 2.3.2
+
+Bugfixes:
+* Fix fish completion script, and install the script correctly
+
+Logo:
+* Fix Xray-OS logo name
+
+# 2.3.1
+
+Bugfixes:
+* Fix man page install location
+
 # 2.3.0
 
+**We are deprecating flags based config files (will be removed in v3.0.0). We suggest you migrate to json based config files.**
+
 Config related changes:
 * The deprecated flag `--gen-config conf` is removed
 * Flag `--gen-config` now does the same thing as `--migrate-config`, which can be used as config migration and default config file generation. Flag `--migrate-config` is removed
@@ -9,8 +24,6 @@ Config related changes:
 * Config files will always be loaded before other command line flags being parsed. That is to say, command line flags will always override options defined in config files.
 * the value of GPUType `integrated` contained a typo and was fixed. Existing config files may need to be updated.
 
-We are deprecating flags based config files (will be removed in v3.0.0). We suggest you migrate to json based config files.
-
 Features:
 * Support Oils and elvish shell version detection (Shell)
 * Support Windows Server Core (Windows)
@@ -35,7 +48,7 @@ Bugfixes:
 * Fix some memory leaks
 * Fix used swap space detection (Swap, FreeBSD)
 * Don't leak fds to child processes (Linux)
-* Fix possible issues when reading procfs (Linux)
+* Fix possible issues when reading procfs (Linux, @apocelipes)
 
 Logos:
 * Add Adelie, Ironclad

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.3.0
+    VERSION 2.3.2
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -1040,6 +1040,12 @@ install(
     RENAME "${CMAKE_PROJECT_NAME}"
 )
 
+install(
+    FILES "${CMAKE_SOURCE_DIR}/completions/fish"
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/fish/vendor_completions.d"
+    RENAME "${CMAKE_PROJECT_NAME}.fish"
+)
+
 install(
     DIRECTORY "${CMAKE_SOURCE_DIR}/presets"
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}"
@@ -1052,7 +1058,7 @@ install(
 
 install(
     FILES "${PROJECT_BINARY_DIR}/fastfetch.1"
-    DESTINATION "${CMAKE_INSTALL_MANDIR}"
+    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
 )
 
 ##################

completions/fish

@@ -1,6 +1,6 @@
 #!/usr/bin/env fish
 
-if not test -x fastfetch
+if not type -q fastfetch
     return
 end
 

src/data/help.json

@@ -545,7 +545,7 @@
         },
         {
             "long": "bar-char-elapsed",
-            "desc": "Set the character to use in elapsed part",
+            "desc": "Set the character to use in elapsed part of percentage bars",
             "arg": {
                 "type": "str",
                 "default": "■"
@@ -553,7 +553,7 @@
         },
         {
             "long": "bar-char-total",
-            "desc": "Set the character to use in total part",
+            "desc": "Set the character to use in total part of percentage bars",
             "arg": {
                 "type": "str",
                 "default": "-"
@@ -561,7 +561,7 @@
         },
         {
             "long": "bar-width",
-            "desc": "Set the width of the bar, in number of characters",
+            "desc": "Set the width of percentage bars, in number of characters",
             "arg": {
                 "type": "num",
                 "default": 10
@@ -569,7 +569,7 @@
         },
         {
             "long": "bar-border",
-            "desc": "Whether to show a border around the bar",
+            "desc": "Whether to show a border around percentage bars",
             "arg": {
                 "type": "bool",
                 "optional": true,

src/logo/builtin.c

@@ -4279,10 +4279,10 @@ static const FFlogo X[] = {
             FF_COLOR_FG_CYAN,
         },
     },
-    //XrayOS
+    //Xray_OS
     {
-        .names = {"XrayOS"},
-        .lines = FASTFETCH_DATATEXT_LOGO_XRAYOS,
+        .names = {"Xray_OS"},
+        .lines = FASTFETCH_DATATEXT_LOGO_XRAY_OS,
         .colors = {
             FF_COLOR_FG_256 "15",
             FF_COLOR_FG_256 "14",