EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1410 from ArmstrongJ/freemint-fixes 

FreeMiNT-specific fixes and updates
This commit is contained in:
dylan 2020-02-15 10:55:23 +02:00 committed by GitHub
parent 9459ca32db bb8831831e
commit d29abf1a8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
neofetch
View File

@ -1267,6 +1267,7 @@ get_model() {
FreeMiNT) FreeMiNT)
model=$(sysctl -n hw.model) model=$(sysctl -n hw.model)
model=${model/ (_MCH *)}
;; ;;
esac esac
@ -1810,11 +1811,11 @@ get_wm() {
freemint_wm=(/proc/*) freemint_wm=(/proc/*)
case ${freemint_wm[*]} in case ${freemint_wm[*]} in
*xaaes*) wm=XaAES ;; *xaaes* | *xaloader*) wm=XaAES ;;
*myaes*) wm=MyAES ;; *myaes*) wm=MyAES ;;
*naes*) wm=N.AES ;; *naes*) wm=N.AES ;;
geneva) wm=Geneva ;; geneva) wm=Geneva ;;
*) wm="Atari AES" ;; *) wm="Atari AES" ;;
esac esac
;; ;;
esac esac
@ -2571,7 +2572,7 @@ get_memory() {
"FreeMiNT") "FreeMiNT")
mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)" mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)"
mem_free="${mem/* }" mem_free="${mem/* }"
mem_total="${mem/ *}" mem_total="${mem/$mem_free}"
mem_used="$((mem_total - mem_free))" mem_used="$((mem_total - mem_free))"
mem_total="$((mem_total / 1024))" mem_total="$((mem_total / 1024))"
mem_used="$((mem_used / 1024))" mem_used="$((mem_used / 1024))"
@ -2838,6 +2839,10 @@ get_resolution() {
[[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}" [[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}"
;; ;;
"FreeMiNT")
# Need to block X11 queries
;;
*) *)
if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
case $refresh_rate in case $refresh_rate in
@ -3722,10 +3727,6 @@ get_cols() {
unset -v blocks blocks2 cols unset -v blocks blocks2 cols
# TosWin2 on FreeMiNT is terrible at this,
# so we'll reset colors arbitrarily.
[[ "$term" == "TosWin2" ]] && printf '\e[30;47m'
# Tell info() that we printed manually. # Tell info() that we printed manually.
prin=1 prin=1
} }
@ -6776,8 +6777,7 @@ EOF
;; ;;
"FreeMiNT"*) "FreeMiNT"*)
# Don't explicitly set colors since set_colors 7
# TosWin2 doesn't reset well.
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ## ${c1} ##
## ######### ## #########