diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48639d0aa..f15eae60f 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 917f021cb..be2d92919 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3910eebfb..c12b8df0d 100644 --- a/CMakeLists.txt +++ b/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}" diff --git a/completions/fish b/completions/fish index aed0dccbc..de5337178 100755 --- a/completions/fish +++ b/completions/fish @@ -1,6 +1,6 @@ #!/usr/bin/env fish -if not test -x fastfetch +if not type -q fastfetch return end diff --git a/src/data/help.json b/src/data/help.json index b643b6771..f63b3d95f 100644 --- a/src/data/help.json +++ b/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, diff --git a/src/logo/ascii/xrayos.txt b/src/logo/ascii/xray_os.txt similarity index 100% rename from src/logo/ascii/xrayos.txt rename to src/logo/ascii/xray_os.txt diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 7409ae568..9e80422f3 100644 --- a/src/logo/builtin.c +++ b/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",