Changeset 133 for trunk/fink/main/finkinfo/macathena-machtype.patch
- Timestamp:
- 04/06/08 21:37:34 (16 years ago)
- Files:
-
- trunk/fink/main/finkinfo/macathena-machtype.patch (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/fink/main/finkinfo/macathena-machtype.patch
r114 r133 1 --- machtype_linux.sh.orig 200 7-12-24 21:51:18.000000000 -06002 +++ machtype_linux.sh 200 7-12-25 00:20:57.000000000 -06001 --- machtype_linux.sh.orig 2008-04-06 20:52:37.000000000 -0400 2 +++ machtype_linux.sh 2008-04-06 20:54:57.000000000 -0400 3 3 @@ -1,4 +1,4 @@ 4 4 -#!/bin/sh … … 20 20 21 21 if [ $display ] ; then 22 - /sbin/lspci | awk -F: '/VGA/ {print $3}' | sed -n -e 's/^ //' -e p22 - lspci | awk -F: '/VGA/ {print $3}' | sed -n -e 's/^ //' -e p 23 23 + system_profiler SPDisplaysDataType | awk 'NR==3 { print }' | sed "s/^ *\(.*\):$/\1/" 24 24 printed=1 … … 26 26 27 27 if [ $rdsk ]; then 28 - awk '/^SCSI device/ { print; } 29 - /^hd[a-z]:/ { print; } 30 - /^Floppy/ { for (i=3; i <= NF; i += 3) print $i ": " $(i+2); }' \ 31 - /var/log/dmesg 28 - for d in /sys/block/[fhs]d*; do 29 - echo $(basename "$d"): \ 30 - $(xargs -I @ expr @ '*' 8 / 15625 < "$d/size")MB \ 31 - $(cat "$d/device/model" || 32 - cat "/proc/ide/$(basename "$d")/model") 33 - done 2>/dev/null 32 34 + disks=`ls /dev/disk* | grep 'disk[0-9]*$'` 33 35 + for disk in $disks … … 39 41 40 42 if [ $memory ] ; then 43 - if [ $verbose ]; then 44 - awk '/^MemTotal:/ { printf "user=%d, phys=%d (%d M)\n", 45 - $2, $2, $2/1024 }' \ 46 - /proc/meminfo 47 - else 48 - awk '/^MemTotal:/ { printf "%d\n", $2 }' /proc/meminfo 41 49 + physmem=$(($(sysctl -n hw.physmem)/1024)) 42 50 + usermem=$(($(sysctl -n hw.usermem)/1024)) 43 if [ $verbose ]; then 44 - awk 'BEGIN { FS="[^0-9]+" } 45 - /^Memory:/ { printf "user=%d, phys=%d (%d M)\n", 46 - $2*1.024, $3*1.024, $3/1000; }' \ 47 - /var/log/dmesg 51 + if [ $verbose ]; then 48 52 + printf "user=%d, phys=%d (%d M)\n" $usermem $physmem $((physmem/1024)) 49 else 50 - awk 'BEGIN { FS="[^0-9]+" } 51 - /^Memory:/ { printf "%d\n", $3*1.024; }' /var/log/dmesg 53 + else 52 54 + echo $physmem 53 55 fi