[U] Release 2.0.2

Fixes hykilpikonna/hyfetch#422

.gitignore

@@ -120,4 +120,15 @@ webhook-log
 start_moderation.sh
 gh_moderator.toml
 moderator-data
-hyfetch/git
+hyfetch/git
+build
+dist
+target
+.vscode
+.idea
+*.iml
+*.egg-info
+__pycache__
+*.pyc
+*.pyo
+*.pyd

Cargo.lock

@@ -251,7 +251,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hyfetch"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "aho-corasick",
  "ansi_colours",

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "2.0.1"
+version = "2.0.2"
 authors = ["Azalea Gui <azalea@hydev.org>"]
 edition = "2021"
 rust-version = "1.75.0"

README.md

@@ -129,6 +129,17 @@ cargo install --git https://github.com/hykilpikonna/hyfetch
 
 <!-- CHANGELOG STARTS HERE --->
 
+### 2.0.2
+
+This is a small patch release that adds more flags and fixes some bugs from the recent Rust rewrite.
+
+* 🏳️‍🌈 **New Flags**: Added new pride flags for Nullflux ([#397](https://github.com/hykilpikonna/hyfetch/pull/397)), Hypergender ([#422](https://github.com/hykilpikonna/hyfetch/pull/422)), Fictosexual ([#394](https://github.com/hykilpikonna/hyfetch/pull/394)), and Adipophilia ([#424](https://github.com/hykilpikonna/hyfetch/pull/424)).
+* 🐛 **Bug Fixes**:
+    * Fixed a critical bug where custom `fastfetch` configurations could break hyfetch ([#420](https://github.com/hykilpikonna/hyfetch/pull/420)).
+    * Corrected the `nixos_small` ASCII logo to display properly ([#421](https://github.com/hykilpikonna/hyfetch/pull/421)).
+* 🔧 **Improvements**:
+    * Improved a warning message for better clarity ([#419](https://github.com/hykilpikonna/hyfetch/issues/419)).
+
 ### 2.0.1
 
 (changelog is generated by Gemini from commit history)

crates/hyfetch/src/neofetch_util.rs

@@ -486,13 +486,8 @@ pub fn get_distro_name(backend: Backend) -> Result<String> {
     match backend {
         Backend::Neofetch => run_neofetch_command_piped(&["ascii_distro_name"])
             .context("failed to get distro name from neofetch"),
-        Backend::Fastfetch => Ok(run_fastfetch_command_piped(&[
+        Backend::Fastfetch => Ok(run_fastfetch_command_piped(&["--logo", "none", "-c", "none", "-s", "OS",])
-            "--logo",
+            .context("failed to get distro name from fastfetch")?.replace("OS: ", "")),
-            "none",
-            "-s",
-            "OS",
-            "--disable-linewrap",
-        ]).context("failed to get distro name from fastfetch")?.replace("OS: ", "")),
         #[cfg(feature = "macchina")]
         Backend::Macchina => {
             // Write ascii art to temp file

crates/hyfetch/src/presets.rs

@@ -63,6 +63,8 @@ pub enum Preset {
 
     Aromantic,
 
+    Fictosexual,
+
     Aroace1,
 
     Aroace2,
@@ -111,6 +113,10 @@ pub enum Preset {
 
     Genderflux,
 
+    Nullflux,
+
+    Hypergender, Hyperboy, Hypergirl, Hyperandrogyne, Hyperneutrois,
+
     Finsexual,
 
     Unlabeled1,
@@ -165,6 +171,8 @@ pub enum Preset {
 
     Twink,
 
+    Adipophilia,
+
     Kenochoric,
 
     Veldian,
@@ -304,6 +312,11 @@ impl Preset {
                 "#3BA740", "#A8D47A", "#FFFFFF", "#ABABAB", "#000000",
             ]),
 
+            // https://orientation.fandom.com/wiki/Fictosexual
+            Self::Fictosexual => ColorProfile::from_hex_colors(vec![
+                "#000000", "#C4C4C4", "#A349A5", "#C4C4C4", "#000000",
+            ]),
+
             // sourced from https://flag.library.lgbt/flags/aroace/
             Self::Aroace1 => ColorProfile::from_hex_colors(vec![
                 "#E28C00", "#ECCD00", "#FFFFFF", "#62AEDC", "#203856",
@@ -433,6 +446,30 @@ impl Preset {
                 "f47694", "f2a2b9", "cecece", "7ce0f7", "3ecdf9", "fff48d",
             ]),
 
+            Self::Nullflux => ColorProfile::from_hex_colors(vec![
+                "#0B0C0E", "#A28DB9", "#E1D4EF", "#F0E6DD", "#665858",
+            ]),
+
+            Self::Hypergender => ColorProfile::from_hex_colors(vec![
+                "#EFEFEF", "#FFFFFF", "#FBFF75", "#000000", "#FBFF75", "#FFFFFF", "#EFEFEF",
+            ]),
+
+            Self::Hyperboy => ColorProfile::from_hex_colors(vec![
+                "#EFEFEF", "#FFFFFF", "#74D7FE", "#000000", "#74D7FE", "#FFFFFF", "#EFEFEF",
+            ]),
+
+            Self::Hypergirl => ColorProfile::from_hex_colors(vec![
+                "#EFEFEF", "#FFFFFF", "#FC76D3", "#000000", "#FC76D3", "#FFFFFF", "#EFEFEF",
+            ]),
+
+            Self::Hyperandrogyne => ColorProfile::from_hex_colors(vec![
+                "#EFEFEF", "#FFFFFF", "#BB83FF", "#000000", "#BB83FF", "#FFFFFF", "#EFEFEF",
+            ]),
+
+            Self::Hyperneutrois => ColorProfile::from_hex_colors(vec![
+                "#EFEFEF", "#FFFFFF", "#BAFA74", "#000000", "#BAFA74", "#FFFFFF", "#EFEFEF",
+            ]),
+
             // sourced from https://lgbtqia.wiki/wiki/Finsexual
             Self::Finsexual => ColorProfile::from_hex_colors(vec![
                 "#B18EDF", "#D7B1E2", "#F7CDE9", "#F39FCE", "#EA7BB3",
@@ -543,6 +580,11 @@ impl Preset {
             // colorpicked from https://commons.wikimedia.org/wiki/File:Twink_Pride_Flag_(proposed).svg
             Self::Twink => ColorProfile::from_hex_colors(vec!["#FFB2FF", "#FFFFFF", "#FFFF81"]),
 
+            // https://en.wikipedia.org/wiki/File:FatFetishFlag.png
+            Self::Adipophilia => ColorProfile::from_hex_colors(vec![
+                "#000000", "#E16180", "#FFF9BE", "#603E41", "#000000",
+            ]),
+
             Self::Kenochoric => {
                 ColorProfile::from_hex_colors(vec!["#000000", "#2E1569", "#824DB7", "#C7A1D6"])
             },

docs/hyfetch.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH VERSION: "1" "August 2025" "Version: 2.0.1" "User Commands"
+.TH VERSION: "1" "September 2025" "Version: 2.0.2" "User Commands"
 .SH NAME
-Version: \- manual page for Version: 2.0.1
+Version: \- manual page for Version: 2.0.2
 .SH SYNOPSIS
 .B hyfetch
 [\fI\,-c\/\fR] [\fI\,-C=CONFIG_FILE\/\fR] [\fI\,-p=PRESET\/\fR] [\fI\,-m=MODE\/\fR] [\fI\,-b=BACKEND\/\fR] [\fI\,--args=ARGS\/\fR] [\fI\,--c-scale=\/\fR
@@ -21,7 +21,7 @@ Use another config file
 .TP
 \fB\-p\fR, \fB\-\-preset\fR=\fI\,PRESET\/\fR
 Use preset
-PRESET={rainbow,transgender,nonbinary,xenogender,agender,queer,genderfluid,bisexual,pansexual,polysexual,omnisexual,omniromantic,gay\-men,lesbian,abrosexual,asexual,aromantic,aroace1,aroace2,aroace3,greysexual,autosexual,intergender,greygender,akiosexual,bigender,demigender,demiboy,demigirl,transmasculine,transfeminine,genderfaun,demifaun,genderfae,demifae,neutrois,biromantic1,autoromantic,boyflux2,girlflux,genderflux,finsexual,unlabeled1,unlabeled2,pangender,pangender.contrast,gendernonconforming1,gendernonconforming2,femboy,tomboy,gynesexual,androsexual,gendervoid,voidgirl,voidboy,nonhuman\-unity,caninekin,plural,fraysexual,bear,butch,leather,otter,twink,kenochoric,veldian,solian,lunian,polyam,sapphic,androgyne,interprogress,progress,intersex,old\-polyam,equal\-rights,drag,pronounfluid,pronounflux,exipronoun,neopronoun,neofluid,genderqueer,cisgender,baker,beiyang,burger,throatlozenges,band,random}
+PRESET={rainbow,transgender,nonbinary,xenogender,agender,queer,genderfluid,bisexual,pansexual,polysexual,omnisexual,omniromantic,gay\-men,lesbian,abrosexual,asexual,aromantic,fictosexual,aroace1,aroace2,aroace3,greysexual,autosexual,intergender,greygender,akiosexual,bigender,demigender,demiboy,demigirl,transmasculine,transfeminine,genderfaun,demifaun,genderfae,demifae,neutrois,biromantic1,autoromantic,boyflux2,girlflux,genderflux,nullflux,hypergender,hyperboy,hypergirl,hyperandrogyne,hyperneutrois,finsexual,unlabeled1,unlabeled2,pangender,pangender.contrast,gendernonconforming1,gendernonconforming2,femboy,tomboy,gynesexual,androsexual,gendervoid,voidgirl,voidboy,nonhuman\-unity,caninekin,plural,fraysexual,bear,butch,leather,otter,twink,adipophilia,kenochoric,veldian,solian,lunian,polyam,sapphic,androgyne,interprogress,progress,intersex,old\-polyam,equal\-rights,drag,pronounfluid,pronounflux,exipronoun,neopronoun,neofluid,genderqueer,cisgender,baker,beiyang,burger,throatlozenges,band,random}
 .TP
 \fB\-m\fR, \fB\-\-mode\fR=\fI\,MODE\/\fR
 Color mode MODE={8bit,rgb}

docs/neofetch.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH NEOFETCH "1" "August 2025" "Neofetch 8.0.1" "User Commands"
+.TH NEOFETCH "1" "September 2025" "Neofetch 8.0.2" "User Commands"
 .SH NAME
-Neofetch \- manual page for Neofetch 8.0.1
+Neofetch \- manual page for Neofetch 8.0.2
 .SH SYNOPSIS
 .B neofetch
 \fI\,func_name --option "value" --option "value"\/\fR

hyfetch/__version__.py

@@ -1 +1 @@
-VERSION = '2.0.1'
+VERSION = '2.0.2'

hyfetch/distros/nixos_small.py

@@ -3,7 +3,7 @@
 from . import AsciiArt
 
 nixos_small = AsciiArt(match=r'''"nixos_small"''', color='4 6', ascii=r"""
-  ${c1}  \\  \\ //
+${c1}  \\  \\ //
  ==\\__\\/ //
    //   \\//
 ==//     //==

hyfetch/main.py

@@ -382,7 +382,7 @@ def run():
     GLOBAL_CFG.use_overlay = args.overlay
 
     if args.version:
-        print(f'Version is {VERSION}')
+        print(f'Version is 1.99.∞\n(python hyfetch legacy mode)')
         return
 
     # Ensure git bash for windows

hyfetch/presets.py

@@ -300,6 +300,9 @@ PRESETS: dict[str, ColorProfile] = {
         '#ABABAB',
         '#000000'
     ]),
+    
+    # https://orientation.fandom.com/wiki/Fictosexual
+    'fictosexual': ColorProfile(["#000000", "#C4C4C4", "#A349A5", "#C4C4C4", "#000000"]),
 
     # aroace1 sourced from https://flag.library.lgbt/flags/aroace/
     'aroace1': ColorProfile([
@@ -550,6 +553,27 @@ PRESETS: dict[str, ColorProfile] = {
         "3ecdf9",
         "fff48d",
     ]),
+    
+    # https://lgbtqia.wiki/wiki/Gendernull
+    'nullflux': ColorProfile([
+        '#0B0C0E', '#A28DB9', '#E1D4EF', '#F0E6DD', '#665858',
+    ]),
+    
+    'hypergender': ColorProfile([
+        "#EFEFEF", "#FFFFFF", "#FBFF75", "#000000", "#FBFF75", "#FFFFFF", "#EFEFEF",
+    ]),
+    'hyperboy': ColorProfile([
+        "#EFEFEF", "#FFFFFF", "#74D7FE", "#000000", "#74D7FE", "#FFFFFF", "#EFEFEF",
+    ]),
+    'hypergirl': ColorProfile([
+        "#EFEFEF", "#FFFFFF", "#FC76D3", "#000000", "#FC76D3", "#FFFFFF", "#EFEFEF",
+    ]),
+    'hyperandrogyne': ColorProfile([
+        "#EFEFEF", "#FFFFFF", "#BB83FF", "#000000", "#BB83FF", "#FFFFFF", "#EFEFEF",
+    ]),
+    'hyperneutrois': ColorProfile([
+        "#EFEFEF", "#FFFFFF", "#BAFA74", "#000000", "#BAFA74", "#FFFFFF", "#EFEFEF",
+    ]),
 
     "finsexual": ColorProfile([
         "#B18EDF",
@@ -751,6 +775,9 @@ PRESETS: dict[str, ColorProfile] = {
         '#FFFFFF',
         '#FFFF81',
     ]),
+    
+    # https://en.wikipedia.org/wiki/File:FatFetishFlag.png
+    'adipophilia': ColorProfile(["#000000", "#E16180", "#FFF9BE", "#603E41", "#000000"]),
 
     'kenochoric': ColorProfile([
         '#000000',

hyfetch/rs.py

@@ -1,3 +1,4 @@
+import os
 import platform
 import subprocess
 import sys
@@ -12,7 +13,9 @@ def run_rust():
     pd = Path(__file__).parent.joinpath('rust')
     pd = pd.joinpath('hyfetch.exe' if platform.system() == 'Windows' else 'hyfetch')
     if not pd.exists():
-        printc('&cThe rust executable is not found, falling back to python...')
+        if 'HYFETCH_DONT_WARN_RUST' not in os.environ:
+            printc('&cThe executable for hyfetch v2 (rust) is not found, falling back to legacy v1.99.∞ (python).\n'
+                   'You can add environment variable HYFETCH_DONT_WARN_RUST=1 to suppress this warning.\n')
         run_py()
         return
 

neofetch

@@ -28,7 +28,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-version=8.0.1
+version=8.0.2
 
 # Fallback to a value of '5' for shells which support bash
 # but do not set the 'BASH_' shell variables (osh).
@@ -225,7 +225,7 @@ package_managers="on"
 
 
 # Show separate user and system packages for supported package managers
-# 
+#
 # Default: 'on'
 # Values:  'on', 'off'
 # Flag:    --package_separate
@@ -1145,7 +1145,7 @@ get_distro() {
                     on|tiny) distro="LindowsOS" ;;
                     *) distro="$(awk '/Version/ {print $2,$3}' /etc/lindowsos-version)"
                 esac
-        
+
             elif [[ -f /etc/astra_version ]]; then
                 distro="Astra Linux"
                 distro_version="$(sed -nr 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p' < /etc/astra_version)"
@@ -1349,7 +1349,7 @@ get_distro() {
                 windows_version_verbose=$(trim "${windows_version_verbose/REG_SZ}")
                 buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_)
                 windows_version_verbose=$(trim "${windows_version_verbose/Windows}")
-                windows_buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_)               
+                windows_buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_)
                 windows_buildnumber=${buildnumber/CurrentBuildNumber}
                 windows_buildnumber=${buildnumber/REG_SZ}
                 if [[ "$windows_version_verbose" == *"10"* ]] && (( windows_buildnumber >= 22000 )); then
@@ -1936,7 +1936,7 @@ get_kernel() {
             *) kernel=${ver} ;;
         esac
         return
-    }  
+    }
 
     # In Interix the Kernel version is commonly comprised of the host OS build number,
     # OS architecture and Interix build number
@@ -2193,7 +2193,7 @@ get_packages() {
             has radula     && tot radula -cl
             # https://github.com/birb-linux/birb
             has birb       && tot birb --list-installed
-            
+
             has port       && pkgs_h=1 tot port installed && ((packages-=1))
 
             # Using the dnf package cache is much faster than rpm.
@@ -2324,7 +2324,7 @@ get_packages() {
             has snap && ps -e | grep -qFm 1 snapd >/dev/null && \
             pkgs_h=1 tot snap list && ((packages-=1))
 
-            # Get AppImageLauncher Application directory, 
+            # Get AppImageLauncher Application directory,
             # See: https://github.com/TheAssassin/AppImageLauncher/wiki/Configuration#settings-file
             manager=appimage && has appimaged || [ -f "$HOME"/.config/appimagelauncher.cfg ] &&
             if [ -f "$HOME"/.config/appimagelauncher.cfg ]; then
@@ -2336,7 +2336,7 @@ get_packages() {
                 AIDIR="$HOME/.local/bin"
             fi &&
             dir "$AIDIR/*.[Aa]pp[Ii]mage \
-                $ALDIR/*.[Aa]pp[Ii]mage" 
+                $ALDIR/*.[Aa]pp[Ii]mage"
 
             # Has devbox & is initialized
             has devbox && [[ "$(devbox global list)" != *"not activated"* ]] && tot devbox global list
@@ -2519,7 +2519,7 @@ get_editor() {
     esac
     editor_v="${editor_v/$'\n'*}"
     editor_v="${editor_v/Version: }"
-    
+
     # Only show editor name if the version string doesn't contain it
     echo "$editor_v" | grep -i "$editor_name" &> /dev/null && editor_name=""
     editor=${editor_name}${editor_v:+ }${editor_v}
@@ -2983,7 +2983,7 @@ get_wm_theme() {
                 wm_theme=$(leftwm-theme status | grep "Your current theme" | sed -e 's/Your current theme is //g' -e 's/\,.*$//g')
             fi
         ;;
-        
+
         fly-wm)
             fly_config_file
             if grep -q 'DecorTheme' "${fly_config_file}" 2>/dev/null; then
@@ -7440,7 +7440,7 @@ EOF
         ;;
 
         "ArseLinux"*)
-            set_colors 4 7 
+            set_colors 4 7
             read -rd '' ascii_data <<'EOF'
 ${c1}
                       ⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
@@ -7972,7 +7972,7 @@ EOF
         "aerOS"*)
             set_colors fg 0 0 0
             read -rd '' ascii_data <<'EOF'
-${c1}                    
+${c1}
                    ooo OOO OOO ooo
                oOO                 OOo
            oOO                         OOo
@@ -8192,23 +8192,23 @@ EOF
         "azos"*)
             set_colors 6 1
             read -rd '' ascii_data <<'EOF'
-${c1}   ////.                     ${c2}                      (((((  
+${c1}   ////.                     ${c2}                      (((((
-${c1} ////////                    ${c2}                    @(((((((( 
+${c1} ////////                    ${c2}                    @((((((((
-${c1} ////////                    ${c2}                    @(((((((( 
+${c1} ////////                    ${c2}                    @((((((((
-${c1} ////////  ///////           ${c2}           (((((((  @(((((((( 
+${c1} ////////  ///////           ${c2}           (((((((  @((((((((
-${c1} //////// /////////          ${c2}          ((((((((( @(((((((( 
+${c1} //////// /////////          ${c2}          ((((((((( @((((((((
-${c1} //////// /////////          ${c2}          ((((((((( @(((((((( 
+${c1} //////// /////////          ${c2}          ((((((((( @((((((((
-${c1} //////// /////////  //////  ${c2}  ((((((  ((((((((( @(((((((( 
+${c1} //////// /////////  //////  ${c2}  ((((((  ((((((((( @((((((((
-${c1} //////// ///////// //////// ${c2} (((((((( ((((((((( @(((((((( 
+${c1} //////// ///////// //////// ${c2} (((((((( ((((((((( @((((((((
-${c1} //////// ///////// //////// ${c2} (((((((( ((((((((( @(((((((( 
+${c1} //////// ///////// //////// ${c2} (((((((( ((((((((( @((((((((
-${c1} //////// ///////// //////// ${c2}  ((((((( ((((((((( @(((((((( 
+${c1} //////// ///////// //////// ${c2}  ((((((( ((((((((( @((((((((
-${c1} //////// /////////   ///    ${c2}     (    ((((((((( @(((((((( 
+${c1} //////// /////////   ///    ${c2}     (    ((((((((( @((((((((
-${c1} //////// /////////          ${c2}          ((((((((( @(((((((( 
+${c1} //////// /////////          ${c2}          ((((((((( @((((((((
-${c1} //////// /////////          ${c2}          &(((((((( @(((((((( 
+${c1} //////// /////////          ${c2}          &(((((((( @((((((((
-${c1} ////////  //////            ${c2}            @((((   @(((((((( 
+${c1} ////////  //////            ${c2}            @((((   @((((((((
-${c1} ////////                    ${c2}                    @(((((((( 
+${c1} ////////                    ${c2}                    @((((((((
-${c1} ////////                    ${c2}                    @(((((((( 
+${c1} ////////                    ${c2}                    @((((((((
-${c1}  /////                      ${c2}                      ((((( 
+${c1}  /////                      ${c2}                      (((((
 EOF
         ;;
 
@@ -8367,7 +8367,7 @@ EOF
         "BlackMesa")
             set_colors 1
             read -rd '' ascii_data <<'EOF'
-${c1}             
+${c1}
            .-;+$XHHHHHHX$+;-.
         ,;X@@X%/;=----=:/%X@@X/,
       =$@@%=.              .=+H@X:
@@ -9285,16 +9285,16 @@ ${c2}
                   ${c3}MMM1ua${c2}
  ${c1}MM${c2}EE        ${c3} MMMMM1uazE${c2}
 ${c1}MM ${c2}EEEE     ${c3}M1MM1uazzEn ${c2}EEEE  MME
-    EEEEE  ${c3}MMM uazEno ${c2}EEEE            
+    EEEEE  ${c3}MMM uazEno ${c2}EEEE
     EEEEE${c1}MMMMMMEno~; ${c2}EE          E${c2}
      EE ${c1}MMMMMMMM~;;E  ${c2}MMMMM      M ${c2}
      E ${c1}MMMMMMMMM          ${c2}  E  E   ${c2}
-      ${c1}MMMMMMMMMMM           
+      ${c1}MMMMMMMMMMM
-           ${c1}MMMMMMMMM ${c2}EE ${c1}      
+           ${c1}MMMMMMMMM ${c2}EE ${c1}
-                MM1MMMM ${c2}EEE ${c1}   
+                MM1MMMM ${c2}EEE ${c1}
-                     MMMMM      
+                     MMMMM
-                          MMM     
+                          MMM
-                              M    
+                              M
 EOF
         ;;
 
@@ -9442,24 +9442,24 @@ EOF
         "openKylin"*)
             set_colors 2 7
             read -rd '' ascii_data <<'EOF'
-${c1}             
+${c1}
-             /KKK]                       
+             /KKK]
-            KKKKKKK`   ]KKKK\            
+            KKKKKKK`   ]KKKK\
-           KKKKK/  /KKKKKKKKK\           
+           KKKKK/  /KKKKKKKKK\
-          KKKK/ ,KKKKKKKKKKKK^          
+          KKKK/ ,KKKKKKKKKKKK^
-  ,]KKK  =KKK` /KKKKKKOOOOOO`            
+  ,]KKK  =KKK` /KKKKKKOOOOOO`
-,KKKKKK  =KK  /`    [\OOOOOOO\           
+,KKKKKK  =KK  /`    [\OOOOOOO\
- \KKKKK  =K            ,OOOOOOO`         
+ \KKKKK  =K            ,OOOOOOO`
- ,KKKKK  =^              \OOOOOO         
+ ,KKKKK  =^              \OOOOOO
-  ,KKKK   ^               OOOOOO^        
+  ,KKKK   ^               OOOOOO^
-   *KKK^                  =OOOOO^        
+   *KKK^                  =OOOOO^
-    OOKK^                 OOOOOO^        
+    OOKK^                 OOOOOO^
-    \OOOK\               /OOOOOO`        
+    \OOOK\               /OOOOOO`
-     OOOOOO]           ,OOOOOOO^         
+     OOOOOO]           ,OOOOOOO^
-     ,OOOOOOOO\]   ,[OOOOOOOOO/          
+     ,OOOOOOOO\]   ,[OOOOOOOOO/
-       \OOOOOOOOOOOOOOOOOOOOO`           
+       \OOOOOOOOOOOOOOOOOOOOO`
-         [OOOOOOOOOOOOOOOO/`             
+         [OOOOOOOOOOOOOOOO/`
-            ,[OOOOOOOOO]                 
+            ,[OOOOOOOOO]
 EOF
         ;;
 
@@ -9890,21 +9890,21 @@ EOF
         "eweOS"*)
             set_colors 7 11 9 8 1
             read -rd '' ascii_data <<'EOF'
-${c2}           #####%%%                     
+${c2}           #####%%%
-${c2}        ##%%${c3}////${c2}%%%%%${c3}///                
+${c2}        ##%%${c3}////${c2}%%%%%${c3}///
-${c2}       #%%%%${c3}////((((////${c2}%               
+${c2}       #%%%%${c3}////((((////${c2}%
-${c1}    *@@@@@@@${c3}/${c5},,,${c3}/////${c5},,,${c2}%${c1}@@@@@@@        
+${c1}    *@@@@@@@${c3}/${c5},,,${c3}/////${c5},,,${c2}%${c1}@@@@@@@
-${c1}  .@@@@@@@@@@@${c3}////////${c2}%%%${c1}@@@@@@@@@@@@   
+${c1}  .@@@@@@@@@@@${c3}////////${c2}%%%${c1}@@@@@@@@@@@@
-${c1} @@@${c4}...${c1}@@@@@@${c3}////${c2}%%${c3}////${c1}@@@@@@@@@@@@@@@@ 
+${c1} @@@${c4}...${c1}@@@@@@${c3}////${c2}%%${c3}////${c1}@@@@@@@@@@@@@@@@
 ${c1} @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 ${c1} @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 ${c1}   @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 ${c1}         @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-${c1}          @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 
+${c1}          @@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-${c1}           @@@@@@@@@@@@@@@@@@@@@@@@@@@  
+${c1}           @@@@@@@@@@@@@@@@@@@@@@@@@@@
-${c1}             @@@@@@@@@@@@@@@@@@@@@@@    
+${c1}             @@@@@@@@@@@@@@@@@@@@@@@
-${c1}              @@@@@@         @@@@@@     
+${c1}              @@@@@@         @@@@@@
-${c1}                @@@           @@@       
+${c1}                @@@           @@@
 EOF
         ;;
 
@@ -12126,7 +12126,7 @@ EOF
         "nixos_small")
             set_colors 4 6
             read -rd '' ascii_data <<'EOF'
-  ${c1}  \\\\  \\\\ //
+${c1}  \\\\  \\\\ //
  ==\\\\__\\\\/ //
    //   \\\\//
 ==//     //==
@@ -13034,39 +13034,39 @@ EOF
             set_colors 11
             read -rd '' ascii_data <<'EOF'
 ${c1}
-                  '',,,               ,,,d,                 
+                  '',,,               ,,,d,
-              ',,                           ,,'             
+              ',,                           ,,'
-           ',                                   ,.          
+           ',                                   ,.
-         .,                                       '         
+         .,                                       '
-        .                                           .       
+        .                                           .
-      '                                               .     
+      '                                               .
-    ..                   oddddkdlc:;,..                ..   
+    ..                   oddddkdlc:;,..                ..
-   .                        ............lllc,            .  
+   .                        ............lllc,            .
-  .                       ....................:           . 
+  .                       ....................:           .
- .                        .  ....................           
+ .                        .  ....................
-      '.                     ..........'o........d0XX0.     
+      '.                     ..........'o........d0XX0.
-     ....lllllllcOOOcllllll............cxlxc...;okkkx.      
+     ....lllllllcOOOcllllll............cxlxc...;okkkx.
-     ..................................';lc'...lo.          
+     ..................................';lc'...lo.
-    .'''''''''''''.....................,;,.......           
+    .'''''''''''''.....................,;,.......
-    ',,,,,,,,,,,,,,,,''...............dkkkd......           
+    ',,,,,,,,,,,,,,,,''...............dkkkd......
-    ',,,,,,,,,,,,,,,,,,,'............;okkkd;....            
+    ',,,,,,,,,,,,,,,,,,,'............;okkkd;....
-    .,,,,,,,,,,,,,,,,,,,,,............;cll;.....            
+    .,,,,,,,,,,,,,,,,,,,,,............;cll;.....
-      ,,,,,,,,,,,,,,,,,,,,'....................:d,          
+      ,,,,,,,,,,,,,,,,,,,,'....................:d,
-       ,,,,,,,,,,,,,,,,,,,....................oxxx:         
+       ,,,,,,,,,,,,,,,,,,,....................oxxx:
-        .,,,,,,,,,,,,,,,,,'..................oxxxxx.  .     
+        .,,,,,,,,,,,,,,,,,'..................oxxxxx.  .
-         .,,,,,,,,,,,,,,'..........        ,oxxxxxxx .      
+         .,,,,,,,,,,,,,,'..........        ,oxxxxxxx .
-        .;,,,,,,,,,,,,'..                'cxxxxxxxxx,       
+        .;,,,,,,,,,,,,'..                'cxxxxxxxxx,
-         :dl:,'',,'....               .;lxxxxxxxxxd;        
+         :dl:,'',,'....               .;lxxxxxxxxxd;
-          ,codol:;'.           ...,;cldxxxxxxxxxoc.         
+          ,codol:;'.           ...,;cldxxxxxxxxxoc.
-            .:cxxxxxdlccccc:ccldxxxxxxxxxxxxxx::.           
+            .:cxxxxxdlccccc:ccldxxxxxxxxxxxxxx::.
-              .'::dxxxxxxxxxxxxxxxxxxxxxxxd::'.             
+              .'::dxxxxxxxxxxxxxxxxxxxxxxxd::'.
-                 ..,::cdxxxxxxxxxxxxxdc::,..                
+                 ..,::cdxxxxxxxxxxxxxdc::,..
-                      ...,;:::::::;,...                     
+                      ...,;:::::::;,...
-                                                            
+
-                                                            
+
 EOF
         ;;
-        
+
         "phyOS"*)
             set_colors 33 33 7 1
             read -rd '' ascii_data <<'EOF'
@@ -13530,26 +13530,26 @@ EOF
         "Reborn OS"* | "Reborn"*)
             set_colors 0 4 6
             read -rd '' ascii_data <<'EOF'
-${c1}          .======================.          
+${c1}          .======================.
-         ${c1}.#${c2}#*********${c1}%%${c2}*********#${c1}%:         
+         ${c1}.#${c2}#*********${c1}%%${c2}*********#${c1}%:
-        ${c1}:%${c2}#**********${c1}%%${c2}**********#${c1}%-        
+        ${c1}:%${c2}#**********${c1}%%${c2}**********#${c1}%-
-       ${c1}-%${c2}************${c1}%%${c2}************${c1}%=       
+       ${c1}-%${c2}************${c1}%%${c2}************${c1}%=
-      ${c1}+%${c2}******${c1}%%#####${c1}%%#####%%${c2}******${c1}%+      
+      ${c1}+%${c2}******${c1}%%#####${c1}%%#####%%${c2}******${c1}%+
-     ${c1}*%%#${c2}****${c1}%#${c3}+=====${c1}%%${c3}=====+${c1}#%${c2}****${c1}#%%*     
+     ${c1}*%%#${c2}****${c1}%#${c3}+=====${c1}%%${c3}=====+${c1}#%${c2}****${c1}#%%*
-    ${c1}*%${c2}*#${c1}#%%#%#${c3}====+++${c1}%%${c3}+++====${c1}#%#%%#${c2}#*${c1}##.   
+    ${c1}*%${c2}*#${c1}#%%#%#${c3}====+++${c1}%%${c3}+++====${c1}#%#%%#${c2}#*${c1}##.
-  ${c1}.##${c2}*****${c1}#%%%#${c3}*++${c1}%######%${c3}*+*${c1}#%%%#${c2}*****${c1}#%.  
+  ${c1}.##${c2}*****${c1}#%%%#${c3}*++${c1}%######%${c3}*+*${c1}#%%%#${c2}*****${c1}#%.
- ${c1}:%#${c2}*****${c1}#%${c3}*=+*${c1}#%%${c3}*++++++*${c1}%%#${c3}*+=*${c1}%#${c2}*****${c1}#%: 
+ ${c1}:%#${c2}*****${c1}#%${c3}*=+*${c1}#%%${c3}*++++++*${c1}%%#${c3}*+=*${c1}%#${c2}*****${c1}#%:
 ${c1}-%#${c2}*****${c1}#%${c3}+====*${c1}%${c3}*++++++++*${c1}%#${c3}====+${c1}%#${c2}******${c1}%-
 ${c1}-%#${c2}*****${c1}#%${c3}+====*${c1}%${c3}*++++++++*${c1}%#${c3}====+${c1}%#${c2}******${c1}%=
- ${c1}:%#${c2}*****${c1}#%${c3}*=+*${c1}#%%${c3}*++++++*${c1}%%#${c3}*+=*${c1}%#${c2}*****${c1}#%- 
+ ${c1}:%#${c2}*****${c1}#%${c3}*=+*${c1}#%%${c3}*++++++*${c1}%%#${c3}*+=*${c1}%#${c2}*****${c1}#%-
-  ${c1}.##${c2}*****${c1}#%%%#${c3}*+*${c1}%######%${c3}*+*${c1}#%%%#${c2}*****${c1}#%:  
+  ${c1}.##${c2}*****${c1}#%%%#${c3}*+*${c1}%######%${c3}*+*${c1}#%%%#${c2}*****${c1}#%:
-   ${c1}.##${c2}**${c1}#%%#%#${c3}====+++${c1}%%${c3}+++====${c1}#%#%%#${c2}#*${c1}##.   
+   ${c1}.##${c2}**${c1}#%%#%#${c3}====+++${c1}%%${c3}+++====${c1}#%#%%#${c2}#*${c1}##.
-     ${c1}*%%#${c2}****${c1}%#${c3}+=====${c1}%%${c3}=====+${c1}#%${c2}****${c1}#%%*     
+     ${c1}*%%#${c2}****${c1}%#${c3}+=====${c1}%%${c3}=====+${c1}#%${c2}****${c1}#%%*
-      ${c1}+%${c2}******${c1}%%#####%%#####%%${c2}******${c1}%*      
+      ${c1}+%${c2}******${c1}%%#####%%#####%%${c2}******${c1}%*
-       ${c1}-%${c2}************${c1}%%${c2}************${c1}%=       
+       ${c1}-%${c2}************${c1}%%${c2}************${c1}%=
-        ${c1}:%${c2}#**********${c1}%%${c2}**********#${c1}%-        
+        ${c1}:%${c2}#**********${c1}%%${c2}**********#${c1}%-
-         ${c1}:%${c2}#*********${c1}%%${c2}*********#${c1}%:         
+         ${c1}:%${c2}#*********${c1}%%${c2}*********#${c1}%:
-          ${c1}.======================.    
+          ${c1}.======================.
 EOF
         ;;
 
@@ -13723,20 +13723,20 @@ EOF
         "RhaymOS"*)
             set_colors 1
             read -rd '' ascii_data <<'EOF'
-${c1}             
+${c1}
-                    ###                 
+                    ###
-                   #####                       
+                   #####
-                                        
+
-              #######        /######## 
+              #######        /########
-           #############   ########### 
+           #############   ###########
-   ,###########      ####  ####(..     
+   ,###########      ####  ####(..
-  ####   ####       ####*  ##########  
+  ####   ####       ####*  ##########
   ####    #####     #####         (####
-  ####      ###########    ########### 
+  ####      ###########    ###########
-  ####       #########     ########## 
+  ####       #########     ##########
-                                       
+
-  ###################################  
+  ###################################
- ##################################### 
+ #####################################
 #######################################
 EOF
         ;;
@@ -15046,29 +15046,29 @@ oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso
             .-\+oossssoo+/-.
 EOF
         ;;
-        
+
         "Floflis"*)
             set_colors 1 7 3
             read -rd '' ascii_data <<'EOF'
-\e[96m              ,▄▄▄▌▓▓███▓▓▌▄▄▄,             
+\e[96m              ,▄▄▄▌▓▓███▓▓▌▄▄▄,
-         ,▄▒▓███████████████████▓▄▄         
+         ,▄▒▓███████████████████▓▄▄
-       ▄▓███████████████████████████▌       
+       ▄▓███████████████████████████▌
-      ▓███████████████████████████████      
+      ▓███████████████████████████████
-   ,  ╙▓████████████████████████████▀   ▄   
+   ,  ╙▓████████████████████████████▀   ▄
-  ╓█▓▄   ╙▀▓████████████████████▀▀`  ,▄██▓  
+  ╓█▓▄   ╙▀▓████████████████████▀▀`  ,▄██▓
- ╓█████▌▄,    '▀▀▀▀▓▓▓▓▓▓▀▀Å╙`    ▄▄▓█████▌ 
+ ╓█████▌▄,    '▀▀▀▀▓▓▓▓▓▓▀▀Å╙`    ▄▄▓█████▌
  ██████████▓▌▄  ,             ▄▓███████████▄
 ╢████████████▓  ║████▓▓███▌  ╣█████████████▓
 ▓█████████████  ▐█████████▀  ▓██████████████
 ▓█████████████  ▐█████████▄  ███████████████
 ▀████████████▌  ║█████████▌  ▀█████████████▌
  ████████████M  ▓██████████  ▐█████████████⌐
- ▀██████████▌  ▐███████████▌  ▀███████████▌ 
+ ▀██████████▌  ▐███████████▌  ▀███████████▌
-   ╙▓█████▓   ▓██████████████▄  ▀███████▀   
+   ╙▓█████▓   ▓██████████████▄  ▀███████▀
-     ╝▓██▀  ╓▓████████████████▓   ▀▓██▀     
+     ╝▓██▀  ╓▓████████████████▓   ▀▓██▀
-          ,▄████████████████████▌,          
+          ,▄████████████████████▌,
-          ╝▀████████████████████▓▀'         
+          ╝▀████████████████████▓▀'
-             `╙▀▀▓▓███████▓▀▀╩'             
+             `╙▀▀▓▓███████▓▀▀╩'
 EOF
         ;;
 
@@ -15234,26 +15234,26 @@ EOF
             set_colors 12 12 7 12 4
             read -rd '' ascii_data <<'EOF'
 ${c3}          :${c4}::::::::::::::    ${c5}.
-         ${c3}=#${c4}*============.   ${c5}:#:         
+         ${c3}=#${c4}*============.   ${c5}:#:
-        ${c3}=##%${c4}+----------.   ${c5}.###:        
+        ${c3}=##%${c4}+----------.   ${c5}.###:
-       ${c3}=####.              ${c5}.####:       
+       ${c3}=####.              ${c5}.####:
-      ${c3}=####.                ${c5}.####:      
+      ${c3}=####.                ${c5}.####:
-     ${c3}=###*.   .=${c4}--------.     ${c5}####:     
+     ${c3}=###*.   .=${c4}--------.     ${c5}####:
-    ${c3}=####.   .*#+${c4}======-       ${c5}####:    
+    ${c3}=####.   .*#+${c4}======-       ${c5}####:
-   ${c3}=###*.   .*###+${c4}====-         ${c5}####:   
+   ${c3}=###*.   .*###+${c4}====-         ${c5}####:
-  ${c3}=###*.   .*#####+${c4}==-           ${c5}####:  
+  ${c3}=###*.   .*#####+${c4}==-           ${c5}####:
- ${c3}=###*.   .*#######+${c4}:             ${c5}####: 
+ ${c3}=###*.   .*#######+${c4}:             ${c5}####:
- ${c3}=###*.   .*#######+${c4}:             ${c5}####: 
+ ${c3}=###*.   .*#######+${c4}:             ${c5}####:
-  ${c3}=###*.   .*#####+${c4}==-           ${c5}####:  
+  ${c3}=###*.   .*#####+${c4}==-           ${c5}####:
-   ${c3}=###*.   .*###+${c4}====-         ${c5}####:   
+   ${c3}=###*.   .*###+${c4}====-         ${c5}####:
-    ${c3}=####.   .*#+${c4}======-       ${c5}####:    
+    ${c3}=####.   .*#+${c4}======-       ${c5}####:
-     ${c3}=###*.   .=${c4}--------.    ${c5}.####:     
+     ${c3}=###*.   .=${c4}--------.    ${c5}.####:
-      ${c3}=####.                ${c5}.####:      
+      ${c3}=####.                ${c5}.####:
-       ${c3}=####.              ${c5}.####:       
+       ${c3}=####.              ${c5}.####:
-        ${c3}=###+${c4}--------------${c5}####:        
+        ${c3}=###+${c4}--------------${c5}####:
-         ${c3}=#+${c4}=================-${c5}:         
+         ${c3}=#+${c4}=================-${c5}:
-          ${c3}:${c4}::::::::::::::::::.        
+          ${c3}:${c4}::::::::::::::::::.
-          
+
 EOF
         ;;
 
@@ -15279,25 +15279,25 @@ EOF
             set_colors 8 4
             read -rd '' ascii_data <<'EOF'
 ${c1}
-   `-`                                
+   `-`
-    -yys+/-`                          
+    -yys+/-`
-     `oyyyyy: /osyyyyso+:.            
+     `oyyyyy: /osyyyyso+:.
-       /yyyyy+`+yyyyyyyyyys/.         
+       /yyyyy+`+yyyyyyyyyys/.
-       .-yyyyys.:+//+oyyyyyyyo.       
+       .-yyyyys.:+//+oyyyyyyyo.
-     `oy/`oyyyyy/      ./syyyyy:      
+     `oy/`oyyyyy/      ./syyyyy:
-     syyys`:yyyyyo`       :yyyyy:     
+     syyys`:yyyyyo`       :yyyyy:
-    /yyyyo  .syyyyy-       .yyyyy.    
+    /yyyyo  .syyyyy-       .yyyyy.
-    yyyyy.    +yyyyy/       /yyyy/    
+    yyyyy.    +yyyyy/       /yyyy/
-   `yyyyy      :yyyyys`     -yyyyo    
+   `yyyyy      :yyyyys`     -yyyyo
-    yyyyy.      `syyyyy-    /yyyy/    
+    yyyyy.      `syyyyy-    /yyyy/
-    /yyyyo        /yyyyy+  .yyyyy.    
+    /yyyyo        /yyyyy+  .yyyyy.
-     syyyys.       -yyyyys.:yyyy:     
+     syyyys.       -yyyyys.:yyyy:
-     `oyyyyyo-`     `oyyyyy:.sy:      
+     `oyyyyyo-`     `oyyyyy:.sy:
-       :syyyyyyso+/++`/yyyyyo``       
+       :syyyyyyso+/++`/yyyyyo``
-         -oyyyyyyyyyyy-.syyyys.       
+         -oyyyyyyyyyyy-.syyyys.
-            -/+osyyyyso.`+yyyyy/      
+            -/+osyyyyso.`+yyyyy/
-                          .-/+syo`    
+                          .-/+syo`
-                                `.    
+                                `.
 EOF
         ;;
 
@@ -15798,21 +15798,21 @@ EOF
             set_colors 4 7
             read -rd '' ascii_data <<'EOF'
 ${c1}
-         . .:. .         .:.            
+         . .:. .         .:.
-        .^^.!.:::.    .^!?J?^           
+        .^^.!.:::.    .^!?J?^
-      .:^.^!!!~:~^.  .7??77!~~^.        
+      .:^.^!!!~:~^.  .7??77!~~^.
-     .~^.!??77?!.^~:  ..:^^7JJJ7~~^.    
+     .~^.!??77?!.^~:  ..:^^7JJJ7~~^.
-     .^~.^7???7~.~~.   .7??????????!    
+     .^~.^7???7~.~~.   .7??????????!
-      .:^:^^~^^:!^ ^:  .......^!:...    
+      .:^:^^~^^:!^ ^:  .......^!:...
-    .!7~.::.!.::. ~BG~    :^  ^~:       
+    .!7~.::.!.::. ~BG~    :^  ^~:
-    :!!~   ~.    ?BBBB!  ^?J!.  .!~.    
+    :!!~   ~.    ?BBBB!  ^?J!.  .!~.
-     :!. .JBY. .Y#BBBY?~!???J7. :^^.    
+     :!. .JBY. .Y#BBBY?~!???J7. :^^.
-     .. :5#B#P~P#BBP?7?55J?J7:          
+     .. :5#B#P~P#BBP?7?55J?J7:
-       ^P#BBBBBBBB5?7J5555J!.....       
+       ^P#BBBBBBBB5?7J5555J!.....
-      !BBBBBBGBBGJ77::Y555J?77777^      
+      !BBBBBBGBBGJ77::Y555J?77777^
-     ?BBBBG5JJ5PJ?!:  .?Y??????77?~.    
+     ?BBBBG5JJ5PJ?!:  .?Y??????77?~.
-   .YBGPYJ??????Y?^^^^~7?????????7?!.   
+   .YBGPYJ??????Y?^^^^~7?????????7?!.
-   .^^:..::::::::.....:::::::::::..:.  
+   .^^:..::::::::.....:::::::::::..:.
 EOF
         ;;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "neowofetch",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Updated neofetch",
   "repository": {
     "type": "git",

tools/deploy-release.py

@@ -51,8 +51,15 @@ def edit_versions(version: str):
     path = Path('hyfetch/__version__.py')
     content = [f"VERSION = '{version}'" if l.startswith('VERSION = ') else l for l in path.read_text().split('\n')]
     path.write_text('\n'.join(content))
+    
+    # 3. Cargo.toml
+    print('Editing Cargo.toml...')
+    path = Path('Cargo.toml')
+    content = path.read_text()
+    content = re.sub(r'(?<=^version = ")[^"]+(?="$)', version, content, flags=re.MULTILINE)
+    path.write_text(content)
 
-    # 3. README.md
+    # 4. README.md
     print('Editing README.md...')
     path = Path('README.md')
     content = path.read_text()
@@ -61,7 +68,7 @@ def edit_versions(version: str):
     content = content[:changelog_i] + f'\n\n### {version}' + content[changelog_i:]
     path.write_text(content)
 
-    # 4. neofetch script
+    # 5. neofetch script
     print('Editing neofetch...')
     path = Path('neofetch')
     lines = path.read_text().replace("\t", "        ").split('\n')
@@ -125,7 +132,12 @@ def create_release(v: str):
     subprocess.check_call(['git', 'tag', f'neofetch-{NEOFETCH_NEW_VERSION}'])
 
     i = input('Please check the commit is correct. Press y to continue or any other key to cancel.')
-    assert i == 'y'
+    if i.lower() != 'y':
+        print('Aborting...')
+        subprocess.check_call(['git', 'reset', '--hard', 'HEAD~1'])
+        subprocess.check_call(['git', 'tag', '-d', v])
+        subprocess.check_call(['git', 'tag', '-d', f'neofetch-{NEOFETCH_NEW_VERSION}'])
+        exit(1)
 
     # 4. Push
     print('Pushing commits...')