Revision 201, 1.6 kB
(checked in by quentin, 12 years ago)
|
Update and fix the macathena-machtype port
|
- Property svn:eol-style set to
native
- Property svn:executable set to
*
|
Line | |
---|
1 |
--- machtype_linux.sh.orig 2011-10-28 17:31:43.000000000 -0400 |
---|
2 |
+++ machtype_linux.sh 2012-02-20 12:33:57.000000000 -0500 |
---|
3 |
@@ -1,4 +1,4 @@ |
---|
4 |
-#!/bin/sh |
---|
5 |
+#!/bin/bash |
---|
6 |
# $Id: machtype_linux.sh,v 1.9 2003-08-12 21:47:50 jweiss Exp $ |
---|
7 |
|
---|
8 |
# We need to support the following options: |
---|
9 |
@@ -91,7 +91,7 @@ |
---|
10 |
fi |
---|
11 |
|
---|
12 |
if [ $syspacks ]; then |
---|
13 |
- echo "Linux does not use system packs." >&2 |
---|
14 |
+ echo "MacAthena does not use system packs." >&2 |
---|
15 |
printed=1 |
---|
16 |
fi |
---|
17 |
|
---|
18 |
@@ -145,27 +145,26 @@ |
---|
19 |
fi |
---|
20 |
|
---|
21 |
if [ $display ] ; then |
---|
22 |
- lspci | awk -F: '/VGA/ {print $3}' | sed -n -e 's/^ //' -e p |
---|
23 |
+ system_profiler SPDisplaysDataType | awk 'NR==3 { print }' | sed "s/^ *\(.*\):$/\1/" |
---|
24 |
printed=1 |
---|
25 |
fi |
---|
26 |
|
---|
27 |
if [ $rdsk ]; then |
---|
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 |
---|
34 |
+ disks=`ls /dev/disk* | grep 'disk[0-9]*$'` |
---|
35 |
+ for disk in $disks |
---|
36 |
+ do |
---|
37 |
+ printf "%s: %s GB\n" "$(basename $disk)" "$(diskutil info "$disk" | awk '$1=="Total" { print $3 }')" |
---|
38 |
+ done |
---|
39 |
printed=1 |
---|
40 |
fi |
---|
41 |
|
---|
42 |
if [ $memory ] ; then |
---|
43 |
+ physmem=$(($(sysctl -n hw.physmem)/1024)) |
---|
44 |
+ usermem=$(($(sysctl -n hw.usermem)/1024)) |
---|
45 |
if [ $verbose ]; then |
---|
46 |
- awk '/^MemTotal:/ { printf "user=%d, phys=%d (%d M)\n", |
---|
47 |
- $2, $2, $2/1024 }' \ |
---|
48 |
- /proc/meminfo |
---|
49 |
+ printf "user=%d, phys=%d (%d M)\n" $usermem $physmem $((physmem/1024)) |
---|
50 |
else |
---|
51 |
- awk '/^MemTotal:/ { printf "%d\n", $2 }' /proc/meminfo |
---|
52 |
+ echo $physmem |
---|
53 |
fi |
---|
54 |
printed=1 |
---|
55 |
fi |
---|
56 |
@@ -182,6 +181,6 @@ |
---|
57 |
fi |
---|
58 |
|
---|
59 |
if [ $printed -eq '0' ] ; then |
---|
60 |
- echo linux |
---|
61 |
+ echo darwin |
---|
62 |
fi |
---|
63 |
exit 0 |
---|