diff --git a/neofetch b/neofetch index c5deb210..fdfe0ff8 100755 --- a/neofetch +++ b/neofetch @@ -987,6 +987,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" ;; @@ -1357,7 +1365,7 @@ get_model() { fi ;; - "Mac OS X"|"macOS") + "Mac OS X"|"macOS"|"ravynOS") if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC" -e "Lilu") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else @@ -1658,7 +1666,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/,*} @@ -2028,6 +2036,8 @@ get_de() { case $os in "Mac OS X"|"macOS") de=Aqua ;; + "ravynOS") de=Magma ;; + Windows) case $distro in *"Windows 10"*|*"Windows 11"*) @@ -3069,7 +3079,7 @@ get_memory() { fi ;; - "BSD" | "MINIX") + "BSD" | "MINIX" | "ravynOS") # Mem total. case $kernel_name in "NetBSD"*) mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))" ;; @@ -5531,7 +5541,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 @@ -5541,6 +5552,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 @@ -11300,6 +11312,32 @@ ${c1} `.::///+:/-. --///+//-:`` EOF ;; + "ravynOS") + set_colors 15 + read -rd '' ascii_data <<'EOF' +${c1} ..oooo.. + .o$$$$$$$$$$$$$$o. + od$$$$$$$$$$$$$$$$$$$$$o + o$$$$$$$$$$$$$$$$$$$$$$$$$$o + .$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. + d$$$$$$$$$********$$$$$$$$$$$$$$$b + d$$$$$$$* °****?$$$$$$$$b + $$$$$$* °$$$$$$$ + d$$** .oo$$$$$$$$b + *° o$$$$$$$$$$$$$$ + o$$$$$$$$$$$$$$$$ + o$$$$$$$$$$$$$$$$$P + *$$$$$$$$$$$$$$$$$ + ?$$$$$$$$$$$$$$P + $$$$$$$$$$$$$P + $$$$$$$$$$$$P + ?$$$$$$$$$$* + $$$$$$$*° + d$$$$*° + ° +EOF + ;; + "Reborn OS"* | "Reborn"*) set_colors 2 2 8 read -rd '' ascii_data <<'EOF'