Merge pull request #649 from fastfetch-cli/dev

Release v2.3.2

Author: CarterLi

.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,7 +1,15 @@
+# 2.3.2
+
+Bugfixes:
+* Fix fish completion script, and install the script correctly
+
+Logo:
+* Fix Xray-OS logo name
+
 # 2.3.1
 
 Bugfixes:
-* Man page install location
+* Fix man page install location
 
 # 2.3.0
 

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.1
+    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}"

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,31 +545,31 @@
         },
         {
             "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": "■"
             }
         },
         {
             "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": "-"
             }
         },
         {
             "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
             }
         },
         {
             "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/ascii/xrayos.txt src/logo/ascii/xray_os.txtsrc/logo/ascii/xrayos.txt renamed to src/logo/ascii/xray_os.txt

@@ -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",