Skip to content

Add Correct recognition of Raspberry Pi OS as Raspbian and dummy GPU detection for Raspberry Pi models #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dawidro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Correct recognition of Raspberry Pi OS as Raspbian and dummy GPU detection for Raspberry Pi models #819

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion screenfetch-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,12 +653,22 @@ detectdistro () {
if grep -q -i 'Raspbian' /etc/os-release ; then
distro="Raspbian"
distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release)
elif [[ -f /etc/rpi-issue ]]; then
if grep -q "Raspberry Pi" /etc/rpi-issue; then
distro="Raspbian"
if [[ "$(uname -m)" == "aarch64" ]]; then
distro_release="64-bit"
else
distro_release="32-bit"
fi
distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release)
fi
elif grep -q -i 'BlankOn' /etc/os-release ; then
distro='BlankOn'
distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release)
elif grep -q -i 'Quirinux' /etc/os-release ; then
distro='Quirinux'
distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release)
distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release)
else
distro="Debian"
fi
Expand Down Expand Up @@ -1694,6 +1704,20 @@ detectgpu () {
gpu=$(wmic path Win32_VideoController get caption | sed -n '2p')
elif [[ "${distro}" == "Haiku" ]]; then
gpu="$(listdev | grep -A2 -e 'device Display controller' | "${AWK}" -F': ' '/^ +device/ {print $2}')"
elif [[ "${distro}" == "Raspbian" ]]; then
if [[ -f "/sys/firmware/devicetree/base/model" ]]; then
pi_model=$(tr -d '\0' </sys/firmware/devicetree/base/model)
if [[ "${pi_model}" == *"Raspberry Pi 5"* ]]; then
gpu="VideoCore VII"
elif [[ "${pi_model}" == *"Raspberry Pi 4"* ]] || [[ "${pi_model}" == *"Pi 400"* ]]; then
gpu="VideoCore VI"
elif [[ "${pi_model}" == *"Raspberry Pi Zero"* ]] \
|| [[ "${pi_model}" == *"Raspberry Pi 3"* ]] \
|| [[ "${pi_model}" == *"Raspberry Pi 2"* ]] \
|| [[ "${pi_model}" == *"Raspberry Pi 1"* ]]; then
gpu="VideoCore IV"
fi
fi
else
if [[ -n "$(PATH="/opt/bin:$PATH" type -p nvidia-smi)" ]]; then
gpu=$($(PATH="/opt/bin:$PATH" type -p nvidia-smi | cut -f1) -q | "${AWK}" -F':' '/Product Name/ {gsub(/: /,":"); print $2}' | sed ':a;N;$!ba;s/\n/, /g')
Expand Down