Minor fixes for machine model, wm, and memory on FreeMiNT

This commit is contained in:
Jeffrey Armstrong 2020-02-12 12:23:15 -05:00
parent 997b7dd855
commit 29714e1875
1 changed files with 7 additions and 6 deletions

View File

@ -1261,6 +1261,7 @@ get_model() {
FreeMiNT) FreeMiNT)
model=$(sysctl -n hw.model) model=$(sysctl -n hw.model)
model=${model/ (_MCH *)}
;; ;;
esac esac
@ -1799,11 +1800,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
@ -2560,7 +2561,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))"