From 9778ebf3cf72a537db813e31e2d0a0624a9c0947 Mon Sep 17 00:00:00 2001 From: "Azalea (on HyDEV-Daisy)" Date: Mon, 1 Aug 2022 18:41:47 -0400 Subject: [PATCH] [U] Regenerate help string --- neofetch | 168 +++++++++++++++++++++--------------------- tools/list_distros.py | 14 ++-- 2 files changed, 90 insertions(+), 92 deletions(-) diff --git a/neofetch b/neofetch index 87198941..1b02a8b5 100755 --- a/neofetch +++ b/neofetch @@ -782,46 +782,42 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Asahi, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, instantOS, -# Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, -# ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, -# Artix, Arya, Bedrock, BigLinux, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, -# Bodhi, bonsai, BSD, BunsenLabs, \"Cachy OS\", Calculate, CalinixOS, Carbs, CentOS, CenterOS, Chakra, ChaletOS, -# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, -# DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, Elive, -# EndeavourOS, EncryptOS, Endless, EuroLinux, Exherbo, Fedora, Feren, Finnix, FreeBSD, -# FreeMiNT, Frugalware, Funtoo, FusionX, GalliumOS, Garuda, Gentoo, Pentoo, -# Glaucus, gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Huayra, -# HydroOS, Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, -# KSLinux, Kaisen_Linux, Kubuntu, LEDE, LangitKetujuh, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, -# Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, -# Mer, Minix, MIRACLE_LINUX, Linspire, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, -# Netrunner, Nitrux, NixOS, NomadBSD, Nurunner, NuTyX, OBRevenge, OpenBSD, -# openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, -# osmc, Oracle, Orchid, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, -# TrueOS, PCLinuxOS, pearOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, -# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, -# Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, ShastraOS, Scientific, Septor, -# SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, -# Solus, Soda, Sulin, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, -# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, -# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-Kylin, Ubuntu Touch, Ubuntu-MATE, -# Ubuntu-Studio, Ubuntu-Sway, Ubuntu, Ultramarine, Univention, Uos, Venom, Void, yiffOS, VNux, semc, -# Obarun, wii-linux-ngx, whiite-linux, gc-linux, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. -# NOTE: Arch, Ubuntu, Redhat, Fedora, LangitKetujuh, NixOS and Dragonfly have 'old' logo variants. -# Use '{distro name}_old' to use the old logos. -# NOTE: Ubuntu has flavor variants. -# Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, Ubuntu-Kylin -# Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. -# NOTE: "AOSC OS/Retro", Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, -# CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, Orchid, android, -# Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, -# Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, -# Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, -# postmarketOS, and Void have a smaller logo variant. -# Use '{distro name}_small' to use the small variants. +# +# NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, Android, Antergos, antiX, AOSC OS, +# AOSC OS/Retro, Aperio GNU/Linux, Apricity, Arch, ArchBox, Archcraft, ARCHlabs, ArchMerge, +# ArchStrike, ArcoLinux, Artix, Arya, Asahi, AsteroidOS, Bedrock, BigLinux, Bitrig, BlackArch, BLAG, +# BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Cachy OS, Calculate, CalinixOS, Carbs, CBL- +# Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, Clear Linux OS, +# ClearOS, Clover, Condres, Container Linux by CoreOS, CRUX, Crystal Linux, Cucumber, CutefishOS, +# CyberOS, dahlia, DarkOs, Darwin, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, +# Elementary, Elive, EncryptOS, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, Finnix, +# FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, glaucus, gNewSense, GNOME, GNU, +# GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Hash, Huayra, HydroOS, Hyperbola, iglunix, +# instantOS, IRIX, Itc, januslinux, Kaisen, Kali, KaOS, KDE, Kibojoe, Kogaion, Korora, KSLinux, +# Kubuntu, LangitKetujuh, LaxerOS, LEDE, LibreELEC, Linspire, Linux, Linux Lite, Linux Mint, Linux +# Mint Old, Live Raizo, LMDE, Lubuntu, Lunar, mac, Mageia, MagpieOS, Mandriva, Manjaro, MassOS, +# Maui, Mer, Minix, MIRACLE LINUX, MX, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, NomadBSD, +# Nurunner, NuTyX, Obarun, OBRevenge, Open Source Media Center, OpenBSD, openEuler, OpenIndiana, +# openmamba, OpenMandriva, OpenStage, openSUSE, openSUSE Leap, openSUSE Tumbleweed, OpenWrt, +# OPNsense, Oracle, orchid, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, PCBSD, PCLinuxOS, +# pearOS, Pengwin, Pentoo, Peppermint, Pisi, PNM Linux, Pop!_OS, Porteus, PostMarketOS, Profelis +# SambaBOX, Proxmox, PuffOS, Puppy, PureOS, Q4OS, Qubes, Qubyt, Quibian, Radix, Raspbian, Reborn OS, +# Red Star, Redcore, Redhat, Refracted Devuan, Regata, Regolith, rocky, Rosa, Sabayon, sabotage, +# Sailfish, SalentOS, Scientific, semc, Septor, Serene, SharkLinux, ShastraOS, Siduction, SkiffOS, +# Slackware, SliTaz, SmartOS, Soda, Solus, Source Mage, Sparky, Star, SteamOS, Sulin, SunOS, +# SwagArch, t2, Tails, TeArch, Trisquel, Ubuntu, Ubuntu Budgie, Ubuntu Cinnamon, Ubuntu Kylin, +# Ubuntu MATE, Ubuntu Studio, Ubuntu Sway, Ubuntu Touch, Ubuntu-GNOME, Ultramarine Linux, Univalent, +# Univention, Uos, uwuntu, Venom, VNux, Void, wii-linux-ngx, Windows, Windows 10, Windows 11, +# XFerience, Xubuntu, yiffOS, Zorin have ascii logos. +# +# NOTE: arch, dragonfly, Fedora, LangitKetujuh, nixos, redhat, ubuntu have 'old' logo variants, use +# {distro}_old to use them. +# +# NOTE: alpine, android, aoscosretro, arch, arcolinux, artix, CalinixOS, centos, cleanjaro, crux, +# debian, dragonfly, elementary, fedora, freebsd, gentoo, guix, haiku, hyperbola, linuxlite, +# linuxmint, mac, mageia, manjaro, mx, netbsd, nixos, openbsd, opensuse, orchid, parabola, popos, +# postmarketos, pureos, Raspbian, rocky, slackware, sunos, ubuntu, void have 'small' logo variants, +# use {distro}_small to use them. ascii_distro="auto" # Ascii Colors @@ -5463,53 +5459,55 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: AIX, Asahi, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, - instantOS, Antergos, antiX, \"AOSC OS\", \"AOSC OS/Retro\", - Apricity, ArchCraft, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, - XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, BigLinux, Bitrig, - BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, \"Cachy OS\", - Calculate, CalinixOS, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, - Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - Crystal Linux, CRUX, Cucumber, CutefishOS, dahlia, Debian, Deepin, DesaOS, Devuan, - DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, Elive, EndeavourOS, EncryptOS, Endless, - EuroLinux, Exherbo, Fedora, Feren, Finnix, FreeBSD, FreeMiNT, Frugalware, - Funtoo, FusionX, GalliumOS, Garuda, Gentoo, Pentoo, Glaucus, gNewSense, GNOME, GNU, - GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, janus, Kali, - KaOS, Kaisen_Linux, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LangitKetujuh, - LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, - Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, MIRACLE_LINUX, Linspire, LinuxMint, - Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, - NixOS, NomadBSD, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, - openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, Orchid, - OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, - PCLinuxOS, pearOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, - Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, Reborn_OS, - Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, - sabotage, Sabayon, Sailfish, SalentOS, ShastraOS, Scientific, Septor, - SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, - Solus, Soda, Sulin, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, - t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, - Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-Kylin, Ubuntu-MATE, - Ubuntu-Studio, Ubuntu-Sway, Ubuntu, Ultramarine, Uos, Univention, Venom, Void, VNux, semc, - Obarun, wii-linux-ngx, whiite-linux, gc-linux, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. + NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, + Android, Antergos, antiX, AOSC OS, AOSC OS/Retro, Aperio GNU/Linux, + Apricity, Arch, ArchBox, Archcraft, ARCHlabs, ArchMerge, ArchStrike, + ArcoLinux, Artix, Arya, Asahi, AsteroidOS, Bedrock, BigLinux, + Bitrig, BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, + BunsenLabs, Cachy OS, Calculate, CalinixOS, Carbs, CBL-Mariner, + CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, + Clear Linux OS, ClearOS, Clover, Condres, Container Linux by CoreOS, + CRUX, Crystal Linux, Cucumber, CutefishOS, CyberOS, dahlia, DarkOs, + Darwin, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, + Elementary, Elive, EncryptOS, EndeavourOS, Endless, EuroLinux, + Exherbo, Fedora, Feren, Finnix, FreeBSD, FreeMiNT, Frugalware, + Funtoo, GalliumOS, Garuda, Gentoo, glaucus, gNewSense, GNOME, GNU, + GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Hash, Huayra, + HydroOS, Hyperbola, iglunix, instantOS, IRIX, Itc, januslinux, + Kaisen, Kali, KaOS, KDE, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, + LangitKetujuh, LaxerOS, LEDE, LibreELEC, Linspire, Linux, Linux + Lite, Linux Mint, Linux Mint Old, Live Raizo, LMDE, Lubuntu, Lunar, + mac, Mageia, MagpieOS, Mandriva, Manjaro, MassOS, Maui, Mer, Minix, + MIRACLE LINUX, MX, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, + NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, Open Source Media + Center, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, + OpenStage, openSUSE, openSUSE Leap, openSUSE Tumbleweed, OpenWrt, + OPNsense, Oracle, orchid, OS Elbrus, PacBSD, Parabola, Pardus, + Parrot, Parsix, PCBSD, PCLinuxOS, pearOS, Pengwin, Pentoo, + Peppermint, Pisi, PNM Linux, Pop!_OS, Porteus, PostMarketOS, + Profelis SambaBOX, Proxmox, PuffOS, Puppy, PureOS, Q4OS, Qubes, + Qubyt, Quibian, Radix, Raspbian, Reborn OS, Red Star, Redcore, + Redhat, Refracted Devuan, Regata, Regolith, rocky, Rosa, Sabayon, + sabotage, Sailfish, SalentOS, Scientific, semc, Septor, Serene, + SharkLinux, ShastraOS, Siduction, SkiffOS, Slackware, SliTaz, + SmartOS, Soda, Solus, Source Mage, Sparky, Star, SteamOS, Sulin, + SunOS, SwagArch, t2, Tails, TeArch, Trisquel, Ubuntu, Ubuntu Budgie, + Ubuntu Cinnamon, Ubuntu Kylin, Ubuntu MATE, Ubuntu Studio, Ubuntu + Sway, Ubuntu Touch, Ubuntu-GNOME, Ultramarine Linux, Univalent, + Univention, Uos, uwuntu, Venom, VNux, Void, wii-linux-ngx, Windows, + Windows 10, Windows 11, XFerience, Xubuntu, yiffOS, Zorin have ascii + logos. - NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. + NOTE: arch, dragonfly, Fedora, LangitKetujuh, nixos, redhat, ubuntu + have 'old' logo variants, use {distro}_old to use them. - NOTE: Use '{distro name}_old' to use the old logos. - - NOTE: Ubuntu has flavor variants. - - NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, Ubuntu-Kylin, - Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. - - NOTE: \"AOSC OS/Retro\", Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, - CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, Orchid, android, - Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, - Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, - Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, - postmarketOS, and Void have a smaller logo variant. - - NOTE: Use '{distro name}_small' to use the small variants. + NOTE: alpine, android, aoscosretro, arch, arcolinux, artix, + CalinixOS, centos, cleanjaro, crux, debian, dragonfly, elementary, + fedora, freebsd, gentoo, guix, haiku, hyperbola, linuxlite, + linuxmint, mac, mageia, manjaro, mx, netbsd, nixos, openbsd, + opensuse, orchid, parabola, popos, postmarketos, pureos, Raspbian, + rocky, slackware, sunos, ubuntu, void have 'small' logo variants, + use {distro}_small to use them. --ascii_bold on/off Whether or not to bold the ascii logo. -L, --logo Hide the info text and only show the ascii logo. diff --git a/tools/list_distros.py b/tools/list_distros.py index e0b87917..8ca80fb4 100644 --- a/tools/list_distros.py +++ b/tools/list_distros.py @@ -84,13 +84,13 @@ def parse_ascii_distros() -> list[AsciiArt]: return [v for v in out if v] -def wrap(text: str, max_len: int, leading_space: int): - length = max_len - leading_space +def wrap(text: str, max_len: int, leading: str): + length = max_len - len(leading) lines = [line for raw in text.split('\n') for line in textwrap.wrap(raw, length) or ['']] - return '\n'.join(' ' * leading_space + line if line else line for line in lines) + return '\n'.join(leading + line if line else line for line in lines) -def generate_help(max_len: int = 100, leading_space: int = 32): +def generate_help(max_len: int, leading: str): distros = sorted(list({a.get_friendly_name() for a in parse_ascii_distros()}), key=str.casefold) smalls = [d.replace('_small', '') for d in distros if d.endswith('_small')] @@ -101,9 +101,9 @@ def generate_help(max_len: int = 100, leading_space: int = 32): f"NOTE: {', '.join(olds)} have 'old' logo variants, use {{distro}}_old to use them.\n\n" \ f"NOTE: {', '.join(smalls)} have 'small' logo variants, use {{distro}}_small to use them." - return wrap(out, max_len, leading_space) + return wrap(out, max_len, leading) if __name__ == '__main__': - print(generate_help(100, 0)) - print(generate_help()) + print(generate_help(100, ' ' * 32)) + print(generate_help(100, '# '))