From ec172fb47a05380e2d3dc37ee5a0bc5543b58ff7 Mon Sep 17 00:00:00 2001 From: Zoe Knox Date: Wed, 17 Aug 2022 14:16:33 -0400 Subject: [PATCH 1/3] Add ravynOS platform --- neofetch | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 48b96d21..3de91b29 100755 --- a/neofetch +++ b/neofetch @@ -800,7 +800,7 @@ image_source="auto" # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, # Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, -# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# ravynOS, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, @@ -977,6 +977,14 @@ get_distro() { *) distro=$(< /bedrock/etc/bedrock-release) esac + elif [[ -f /System/Library/CoreServices/SystemVersion.plist ]]; then + os=ravynOS + ascii_distro="ravynOS" + case $distro_shorthand in + tiny) distro="$darwin_name" ;; + on) distro="$darwin_name $osx_version" ;; + *) distro="$darwin_name $darwin_family $osx_version" + esac elif [[ -f /etc/redstar-release ]]; then case $distro_shorthand in on|tiny) distro="Red Star OS" ;; @@ -1256,7 +1264,7 @@ get_model() { fi ;; - "Mac OS X"|"macOS") + "Mac OS X"|"macOS"|"ravynOS") if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else @@ -1435,7 +1443,7 @@ get_uptime() { fi ;; - "Mac OS X"|"macOS"|"iPhone OS"|BSD|FreeMiNT) + "Mac OS X"|"macOS"|"ravynOS"|"iPhone OS"|BSD|FreeMiNT) boot=$(sysctl -n kern.boottime) boot=${boot/\{ sec = } boot=${boot/,*} @@ -1775,6 +1783,8 @@ get_de() { case $os in "Mac OS X"|"macOS") de=Aqua ;; + "ravynOS") de=Mizu ;; + Windows) case $distro in *"Windows 10"*) @@ -2713,7 +2723,7 @@ get_memory() { mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))" ;; - "BSD" | "MINIX") + "BSD" | "MINIX" | "ravynOS") # Mem total. case $kernel_name in "NetBSD"*) mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))" ;; @@ -4895,7 +4905,8 @@ cache_uname() { kernel_version="${uname[1]}" kernel_machine="${uname[2]}" - if [[ "$kernel_name" == "Darwin" ]]; then + if [[ "$kernel_name" == "Darwin" ]] || + [[ "$kernel_name" == "FreeBSD" && -f /System/Library/CoreServices/SystemVersion.plist ]]; then # macOS can report incorrect versions unless this is 0. # https://github.com/dylanaraps/neofetch/issues/1607 export SYSTEM_VERSION_COMPAT=0 @@ -4905,6 +4916,7 @@ cache_uname() { for ((i=0;i<${#sw_vers[@]};i+=2)) { case ${sw_vers[i]} in ProductName) darwin_name=${sw_vers[i+1]} ;; + ProductFamily) darwin_family=${sw_vers[i+1]} ;; ProductVersion) osx_version=${sw_vers[i+1]} ;; ProductBuildVersion) osx_build=${sw_vers[i+1]} ;; esac @@ -5159,8 +5171,8 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, 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, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, ravynOS, + Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, @@ -9977,6 +9989,31 @@ ${c1} `.::///+:/-. --///+//-:`` EOF ;; + "ravynOS") + set_colors 15 + read -rd '' ascii_data <<'EOF' +${c1} ▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓ ▓▓▓▓▓▓ + ▓▓▓ ▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓▓▓ + ▓▓▓▓▓▓▓ + ▓▓▓▓ + +EOF + ;; + "Reborn OS"* | "Reborn"*) set_colors 2 2 8 read -rd '' ascii_data <<'EOF' From 64b7e11392d6b440e630ce2953fc4d3f82d262ae Mon Sep 17 00:00:00 2001 From: Zoe Knox Date: Wed, 17 Aug 2022 14:38:08 -0400 Subject: [PATCH 2/3] Update DE name to Magma --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3de91b29..40e165cc 100755 --- a/neofetch +++ b/neofetch @@ -1783,7 +1783,7 @@ get_de() { case $os in "Mac OS X"|"macOS") de=Aqua ;; - "ravynOS") de=Mizu ;; + "ravynOS") de=Magma ;; Windows) case $distro in From 5966bd0c220d655f5cc695791f9d93a25dfeb2cd Mon Sep 17 00:00:00 2001 From: Zoe Knox Date: Wed, 17 Aug 2022 15:34:32 -0400 Subject: [PATCH 3/3] Improve ascii logo --- neofetch | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/neofetch b/neofetch index 40e165cc..009ffd5f 100755 --- a/neofetch +++ b/neofetch @@ -9992,25 +9992,26 @@ EOF "ravynOS") set_colors 15 read -rd '' ascii_data <<'EOF' -${c1} ▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓ ▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓ ▓▓▓▓▓▓ - ▓▓▓ ▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓▓▓ - ▓▓▓▓▓▓▓ - ▓▓▓▓ - +${c1} ..oooo.. + .o$$$$$$$$$$$$$$o. + od$$$$$$$$$$$$$$$$$$$$$o + o$$$$$$$$$$$$$$$$$$$$$$$$$$o + .$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. + d$$$$$$$$$********$$$$$$$$$$$$$$$b + d$$$$$$$* °****?$$$$$$$$b + $$$$$$* °$$$$$$$ + d$$** .oo$$$$$$$$b + *° o$$$$$$$$$$$$$$ + o$$$$$$$$$$$$$$$$ + o$$$$$$$$$$$$$$$$$P + *$$$$$$$$$$$$$$$$$ + ?$$$$$$$$$$$$$$P + $$$$$$$$$$$$$P + $$$$$$$$$$$$P + ?$$$$$$$$$$* + $$$$$$$*° + d$$$$*° + ° EOF ;;