From 0e8f617f6bbc9245847d8877fdf5e86f24bf20b4 Mon Sep 17 00:00:00 2001 From: shibedrill <53824200+shibedrill@users.noreply.github.com> Date: Sun, 17 Sep 2023 23:05:33 -0400 Subject: [PATCH] Updated distro colors and logos. --- Cargo.lock | 6 +++--- Cargo.toml | 7 +++++-- README.md | 23 +++++++++++++++++------ license.txt | 2 +- src/main.rs | 25 ++++++++++++------------- src/terminal.rs | 24 ++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7b8f92d..2235693 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "oxidefetch" -version = "1.4.1" +version = "1.4.2" dependencies = [ "byte-unit", "chrono", @@ -422,9 +422,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.28.1" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a81bbc26c485910df47772df6bbcdb417036132caa9e51e29d2e39c4636d4e" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ "cfg-if", "core-foundation-sys", diff --git a/Cargo.toml b/Cargo.toml index 48dc950..f1a7dbc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,10 @@ [package] name = "oxidefetch" -version = "1.4.1" +description = "A fast, cross platform Fetch program for your terminal" +version = "1.4.2" edition = "2021" +authors = [ "NamedNeon", "shibedrill" ] +license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -12,7 +15,7 @@ colored = "2.0.0" compound_duration = "1.2.0" lazy_static = "1.4.0" quoted-string = "0.6.1" -sysinfo = "0.28.1" +sysinfo = "0.29.1" whoami = "1.3.0" [profile.release] diff --git a/README.md b/README.md index 4958c0d..29c6462 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# oxidefetch 1.4.1 +# oxidefetch 1.4.2 Fully cross platform Neofetch clone written in Rust. Up to 25 times faster than Neofetch! ![alt text](image.png "Example output of OxideFetch on a WSL2 Arch Linux host") @@ -47,11 +47,21 @@ GPU detection runs on Windows without any dependencies.) 3: Nerd fonts symbols are used in the output. Install a patched font on your system, or patch an already installed font. ### How you can help with the project -I need to verify the output of the OS information detection libraries I'm pulling in. To do this, I need the help of people -with varying types of systems. I've tested Arch Linux and Windows 10, but nothing else. To help, you can kindly clone this -repo, and inside the folder, run ```cargo test -- --nocapture```, and send the resultant ```test_output.txt``` file to my -noreply email address, or directly to me on Discord at ```@shibedrill```. This program does NOT collect information -regarding your real name, IP, location, etc. You can look at the file it generates to be sure- it's all plaintext, babey. +I need to verify the output of the OS information detection libraries I'm pulling in. To do this, I need the help of people with varying types of systems. I've tested a few, but there's some I'm unable to test. To help, you can kindly clone this repo, and inside the folder, run ```cargo test -- --nocapture```, and send the resultant ```test_output.txt``` file to my noreply email address, or directly to me on Discord at ```@shibedrill```. This program does NOT collect information regarding your real name, IP, location, hardware serial numbers, etc. You can look at the file it generates to be sure- it's all plaintext, babey. +#### Tested distributions/platforms: +- Alma Linux +- Alpine Linux +- Arch Linux +- CentOS +- Debian +- Fedora +- Gentoo +- Kali Linux +- Linux Mint +- openSUSE Leap +- openSUSE Tumbleweed +- Ubuntu +- Windows ### Bugs, Quirks, Unintended Behavior, And Other Shenanigans No weird quirks to report at this time. @@ -85,6 +95,7 @@ No weird quirks to report at this time. **1.3.2:** Changed color of time output to be more visible on gray terminals. **1.4.0:** Added support for terminal detection, and fixed system detection on Darwin systems. **1.4.1:** Changed terminal color to match shell color. +**1.4.2:** Updated colors and logos of a few distros. They will now display correctly. ### License This software is covered by the MIT license. See license.txt for details. \ No newline at end of file diff --git a/license.txt b/license.txt index caef332..38c9e10 100644 --- a/license.txt +++ b/license.txt @@ -1,5 +1,5 @@ -Copyright 2023 shibedrill +Copyright 2023 shibedrill & Namedneon Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in diff --git a/src/main.rs b/src/main.rs index 5d0b9d6..8c0a4ce 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ /* -Copyright 2023 shibedrill +Copyright 2023 shibedrill & Namedneon Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in @@ -220,22 +220,22 @@ impl Information { // sys.name() function will return. // TODO: Validate sys.name() outputs. { - "Alma Linux" => '', + "AlmaLinux" => '', "Alpine Linux" => '', "Arch Linux" => '', - "CentOS" => '', + "CentOS Linux" | "CentOS Stream" => '', "Debian GNU/Linux" => '', "ElementaryOS" => '', "EndeavourOS" => '', "Fedora Linux" => '', "FreeBSD" => '', - "Gentoo Linux" => '', - "Kali Linux" => '', + "Gentoo" => '', + "Kali GNU/Linux" => '', "Linux Mint" => '', "Manjaro Linux" => '', - "OpenSUSE" => '', + "openSUSE Tumbleweed" | "openSUSE Leap" => '', "PopOS" => '', - "Ubuntu Linux" => '', + "Ubuntu" => '', "Windows" => '', "Android" => '', "iOS" => '', @@ -266,13 +266,13 @@ impl Information { { "Debian GNU/Linux" => String::from("bright red"), "FreeBSD" => String::from("red"), - "Ubuntu Linux" => String::from("orange"), + "Ubuntu" => String::from("orange"), "Arch Linux" | "Windows" | "PopOS" => String::from("bright cyan"), - "Fedora Linux" | "Kali Linux" | "Alpine Linux" => String::from("bright blue"), - "OpenSUSE" | "Linux Mint" | "Android" => String::from("bright green"), - "EndeavourOS" | "Gentoo linux" | "CentOS" => String::from("purple"), + "Fedora Linux" | "Kali GNU/Linux" | "Alpine Linux" => String::from("bright blue"), + "openSUSE Tumbleweed" | "openSUSE Leap" | "Linux Mint" | "Android" => String::from("bright green"), + "EndeavourOS" | "Gentoo" | "CentOS" | "CentOS Stream" => String::from("purple"), "iOS" | "macOS" | "ElementaryOS" => String::from("bright white"), - "Alma Linux" => String::from("yellow"), + "AlmaLinux" => String::from("yellow"), _ => String::from("bright white"), }, @@ -285,7 +285,6 @@ mod test { use crate::Information; use std::fs; - use crate::terminal::get_terminal; // Self explanatory. #[test] diff --git a/src/terminal.rs b/src/terminal.rs index 81723b0..658ed70 100644 --- a/src/terminal.rs +++ b/src/terminal.rs @@ -1,3 +1,27 @@ +/* + +Copyright 2023 shibedrill & Namedneon + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the “Software”), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +*/ + use std::env; use std::collections::HashMap; use lazy_static::lazy_static;