From 15c97c1722fc387c4f77760a7cfc0119460f2de1 Mon Sep 17 00:00:00 2001 From: Logan Kaval <136924755+LoganKaval@users.noreply.github.com> Date: Wed, 19 Jun 2024 19:48:11 -0500 Subject: [PATCH 1/3] miniMint Has Been Added --- screenfetch-dev | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index e7682e1a..d20a28a4 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -367,7 +367,7 @@ supported_distros="ALDOS, Alpine Linux, AlmaLinux, Alter Linux, Amazon Linux, An blackPanther OS, BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, \ Debian, Deepin, DesaOS,Devuan, Dragora, DraugerOS, elementary OS, EuroLinux, Evolve OS, Sulin, Exherbo, Fedora(Old and Current Logos), Frugalware, Fuduntu, Funtoo, \ Fux, Gentoo, gNewSense, Guix System, Hyperbola GNU/Linux-libre, januslinux, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, \ -LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, OBRevenge, openSUSE, \ +LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, miniMint, Netrunner, NixOS, OBRevenge, openSUSE, \ OS Elbrus, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, PureOS, Quirinux, Qubes OS, \ Raspbian, Red Hat Enterprise Linux, Rocky Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Siduction, Slackware, Solus, Source Mage GNU/Linux, \ SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TeArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS and EndeavourOS" @@ -764,6 +764,9 @@ detectdistro () { distro_release="$("${AWK}" -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" fi fi + "miniMint") + distro="miniMint" + distro_codename=null ;; "neon"|"KDE neon") distro="KDE neon" @@ -1277,6 +1280,7 @@ detectdistro () { mandrake) distro="Mandrake" ;; mandriva) distro="Mandriva" ;; mer) distro="Mer" ;; + minimint) distro="miniMint"; mint|linux*mint) distro="Mint" ;; msys|msys2) distro="Msys" ;; netbsd) distro="NetBSD" ;; @@ -1429,7 +1433,7 @@ detectpkgs () { pkgs=$(pacman-g2 -Q | wc -l) ;; 'Debian'|'Ubuntu'|'Mint'|'Fuduntu'|'KDE neon'|'Devuan'|'OS Elbrus'|'Raspbian'|'Quirinux'|'LMDE'|'CrunchBang'|'Peppermint'| \ 'LinuxDeepin'|'Deepin'|'Kali Linux'|'Trisquel'|'elementary OS'|'gNewSense'|'BunsenLabs'|'SteamOS'|'Parrot Security'| \ - 'GrombyangOS'|'DesaOS'|'Zorin OS'|'Proxmox VE'|'PureOS'|'DraugerOS') + 'GrombyangOS'|'DesaOS'|'Zorin OS'|'Proxmox VE'|'PureOS'|'DraugerOS'|'miniMint') pkgs=$(dpkg -l | grep -c '^i') ;; 'Slackware') pkgs=$(ls -1 /var/log/packages | wc -l) ;; @@ -5579,6 +5583,34 @@ asciiText () { "${c1} '''''' %s") ;; + "miniMint") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'green') # Green + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; fi + startline="0" + logowidth="49" + fulloutput=( +"${c1} MMMMMMMMMMM %s" +"${c1} MMMMMMMMMMMMMMMMM %s" +"${c1} MMMMMMMMMMMMMMMMMMMMM %s" +"${c1}MMMMMMMMMMMMMMMMMMMMMM %s" +"${c1}MMMMMMMMMMMMMMMMMMMMMMMMM MMMMMMMMM %s" +"${c1}MMMMMMMMMMMMMMMMMMMMMMMMMMM MMMMMMMMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMMMMMMMMM MMMMMMMMMMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMMMMMMMMMMMMMMMMM MMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMMMMMMMMMMMM MMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMMMMMMM MMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMMM %s" +"${c1}MMMMMMMMMMMMM MMMMM %s" +"${c1}MMMMMMMMMMMMM %s" +"${c1}MMMMMMMMMMMM %s" +"${c1}MMMMMMMM %s") + ;; + "SailfishOS") if [[ "$no_color" != "1" ]]; then c1=$(getColor 'dark grey') # Grey @@ -6434,7 +6466,7 @@ infoDisplay () { "Gentoo"|"Parabola GNU/Linux-libre"|"Funtoo"|"Funtoo-text"|"BLAG"|"SteamOS"|"Devuan") labelcolor=$(getColor 'light purple') ;; - "Haiku") + "Haiku"|"miniMint") labelcolor=$(getColor 'green') ;; "NetBSD"|"Amazon Linux"|"Proxmox VE") From ae48ed5407c6bb5caab2338eee69cbd5486f6a98 Mon Sep 17 00:00:00 2001 From: Logan Kaval <136924755+LoganKaval@users.noreply.github.com> Date: Thu, 20 Jun 2024 09:37:10 -0500 Subject: [PATCH 2/3] miniMint Doc Added --- .vscode/settings.json | 5 +++++ CHANGELOG | 2 +- screenfetch.1 | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..6c2ff60b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "master" + ] +} \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index f30b28a8..5df78b52 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,7 +40,7 @@ v3.8.0 - Support for Blackbox on Windows - Improve BusyBox shell detection - Added detection for Trinity/TWin, chromeos-wm, FLWM, howm, sway, LXQt and Deepin [DEs/WMs] - - Added detection for Alpine, BunsenLabs, Chrome OS, Chromium OS, Devuan, Fux, GrombyangOS, KDE neon, Kogaion, Mer, Msys, Netrunner, Oracle Linux, PCLinuxOS, Qubes OS, Parrot Security, Pardus, Red Star OS, ROSA, SailfishOS, SparkyLinux, SteamOS, SUSE Linux Enterprise and SwagArch + - Added detection for Alpine, BunsenLabs, Chrome OS, Chromium OS, Devuan, Fux, GrombyangOS, KDE neon, Kogaion, Mer, miniMint, Msys, Netrunner, Oracle Linux, PCLinuxOS, Qubes OS, Parrot Security, Pardus, Red Star OS, ROSA, SailfishOS, SparkyLinux, SteamOS, SUSE Linux Enterprise and SwagArch v3.7.0 - Show RAM in IEC units (MiB instead of MB) diff --git a/screenfetch.1 b/screenfetch.1 index e3c4c1f8..cc93644d 100644 --- a/screenfetch.1 +++ b/screenfetch.1 @@ -21,7 +21,7 @@ This script is very easy to add to and can easily be extended. Supported GNU/Linux Distributions: .IP .\" @supported_distros_start@ -ALDOS, Alpine Linux, Amazon Linux, Antergos, Arch Linux (Old and Current Logos), Artix Linux, blackPanther OS, BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, DesaOS, Devuan, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Fux, Gentoo, gNewSense, Guix System, Hyperbola GNU/Linux-libre, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, OBRevenge, openSUSE, OS Elbrus, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, PureOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Siduction, Slackware, Solus, Source Mage GNU/Linux, SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TeArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS. +ALDOS, Alpine Linux, Amazon Linux, Antergos, Arch Linux (Old and Current Logos), Artix Linux, blackPanther OS, BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, Debian, Deepin, DesaOS, Devuan, Dragora, elementary OS, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, Fux, Gentoo, gNewSense, Guix System, Hyperbola GNU/Linux-libre, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, miniMint, Netrunner, NixOS, OBRevenge, openSUSE, OS Elbrus, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, PureOS, Qubes OS, Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Siduction, Slackware, Solus, Source Mage GNU/Linux, SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TeArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS. .\" @supported_distros_end@ .PP Other Supported Systems: From a6e9ef7ee4e02b30e2a886842d9940955581f9d0 Mon Sep 17 00:00:00 2001 From: Logan Kaval <136924755+LoganKaval@users.noreply.github.com> Date: Thu, 20 Jun 2024 09:38:35 -0500 Subject: [PATCH 3/3] Delete .vscode/settings.json --- .vscode/settings.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 6c2ff60b..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "githubPullRequests.ignoredPullRequestBranches": [ - "master" - ] -} \ No newline at end of file