From 5e7563042ccf2e62d8951ae2d48f5da54cc9d876 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 8 May 2016 13:32:44 +1000 Subject: [PATCH 1/6] added CPU/GPU table for iOS --- idevicehw.csv | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ neofetch | 10 +++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 idevicehw.csv diff --git a/idevicehw.csv b/idevicehw.csv new file mode 100644 index 00000000..411bb95b --- /dev/null +++ b/idevicehw.csv @@ -0,0 +1,55 @@ +iPhone1,1|Samsung S5L8900 @ 412MHz|1|PowerVR MBX Lite 3D +iPhone1,2|Samsung S5L8900 @ 412MHz|1|PowerVR MBX Lite 3D +iPhone2,1|Samsung S5PC100 @ 600MHz|1|PowerVR SGX535 +iPhone3,1|Apple A4 @ 800MHz|1|PowerVR SGX535 +iPhone3,2|Apple A4 @ 800MHz|1|PowerVR SGX535 +iPhone3,3|Apple A4 @ 800MHz|1|PowerVR SGX535 +iPhone4,1|Apple A5 @ 800MHz|2|PowerVR SGX543MP2 +iPhone5,1|Apple A6 @ 1.3GHz|2|PowerVR SGX543MP3 +iPhone5,2|Apple A6 @ 1.3GHz|2|PowerVR SGX543MP3 +iPhone5,3|Apple A6 @ 1.3GHz|2|PowerVR SGX543MP3 +iPhone5,4|Apple A6 @ 1.3GHz|2|PowerVR SGX543MP3 +iPhone6,1|Apple A7 @ 1.3GHz|2|PowerVR G6430 +iPhone6,2|Apple A7 @ 1.3GHz|2|PowerVR G6430 +iPhone7,1|Apple A8 @ 1.4GHz|2|PowerVR GX6450 +iPhone7,2|Apple A8 @ 1.4GHz|2|PowerVR GX6450 +iPhone8,1|Apple A9 @ 1.85GHz|2|PowerVR GT7600 +iPhone8,2|Apple A9 @ 1.85GHz|2|PowerVR GT7600 +iPhone8,4|Apple A9 @ 1.85GHz|2|PowerVR GT7600 +iPod1,1|Samsung S5L8900 @ 412MHz|1|PowerVR MBX Lite +iPod2,1|Samsung S5L8720 @ 533MHz|1|PowerVR MBX Lite +iPod3,1|Samsung S5L8922 @ 600MHz|1|PowerVR SGX535 +iPod4,1|Apple A4 @ 800MHz|1|PowerVR SGX535 +iPod5,1|Apple A5 @ 800MHz|2|PowerVR SGX543MP2 +iPod7,1|Apple A8 @ 1.1GHz|2|PowerVR GX6450 +iPad1,1|Apple A4 @ 1GHz|1|PowerVR SGX535 +iPad2,1|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 +iPad2,2|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 +iPad2,3|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 +iPad2,4|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 +iPad2,5|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 +iPad2,6|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 +iPad2,7|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 +iPad3,1|Apple A5X @ 1GHz|2|PowerVR SGX543MP4 +iPad3,2|Apple A5X @ 1GHz|2|PowerVR SGX543MP4 +iPad3,3|Apple A5X @ 1GHz|2|PowerVR SGX543MP4 +iPad3,4|Apple A6X @ 1.4GHz|2|PowerVR SGX554MP4 +iPad3,5|Apple A6X @ 1.4GHz|2|PowerVR SGX554MP4 +iPad3,6|Apple A6X @ 1.4GHz|2|PowerVR SGX554MP4 +iPad4,1|Apple A7 @ 1.4GHz|2|PowerVR G6430 +iPad4,2|Apple A7 @ 1.4GHz|2|PowerVR G6430 +iPad4,3|Apple A7 @ 1.4GHz|2|PowerVR G6430 +iPad4,4|Apple A7 @ 1.3GHz|2|PowerVR G6430 +iPad4,5|Apple A7 @ 1.3GHz|2|PowerVR G6430 +iPad4,6|Apple A7 @ 1.3GHz|2|PowerVR G6430 +iPad4,7|Apple A7 @ 1.3GHz|2|PowerVR G6430 +iPad4,8|Apple A7 @ 1.3GHz|2|PowerVR G6430 +iPad4,9|Apple A7 @ 1.3GHz|2|PowerVR G6430 +iPad5,1|Apple A8 @ 1.5GHz|2|PowerVR GX6450 +iPad5,2|Apple A8 @ 1.5GHz|2|PowerVR GX6450 +iPad5,3|Apple A8X @ 1.5GHz|3|PowerVR GXA6850 +iPad5,4|Apple A8X @ 1.5GHz|3|PowerVR GXA6850 +iPad6,3|Apple A9X @ 2.16GHz|2|PowerVR 7XT +iPad6,4|Apple A9X @ 2.16GHz|2|PowerVR 7XT +iPad6,7|Apple A9X @ 2.26GHz|2|PowerVR 7XT +iPad6,8|Apple A9X @ 2.26GHz|2|PowerVR 7XT diff --git a/neofetch b/neofetch index f50496c9..efdc18de 100755 --- a/neofetch +++ b/neofetch @@ -950,7 +950,11 @@ getcpu () { cores=$(sysctl -n hw.ncpu) ;; - "iPhone OS") ;; + "iPhone OS") + cpu="$(awk -F '|' '/$(uname -m)/ {printf $2}' idevicehw.csv)" + cores="$(awk -F '|' '/$(uname -m)/ {printf $3}' idevicehw.csv)" + ;; + *) case "$distro" in "OpenBSD"* | "FreeBSD"*) @@ -1162,6 +1166,10 @@ getgpu () { fi ;; + "iPhone OS") + gpu=$(awk -F '|' '/$(uname -m)/ {printf $4}' idevicehw.csv)" + ;; + *"BSD") case "$distro" in "FreeBSD"*) From 3376a7d697f00bfb0d7a752e1ca359af7f147d08 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 8 May 2016 13:40:55 +1000 Subject: [PATCH 2/6] oops, forgot a quote --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index efdc18de..16f82231 100755 --- a/neofetch +++ b/neofetch @@ -1167,7 +1167,7 @@ getgpu () { ;; "iPhone OS") - gpu=$(awk -F '|' '/$(uname -m)/ {printf $4}' idevicehw.csv)" + gpu="$(awk -F '|' '/$(uname -m)/ {printf $4}' idevicehw.csv)" ;; *"BSD") From 94430374cb13f2893532581193b8c3d8b59ccedd Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 8 May 2016 13:46:19 +1000 Subject: [PATCH 3/6] only call uname -m once, might fix awk --- neofetch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 16f82231..b53ff6db 100755 --- a/neofetch +++ b/neofetch @@ -502,6 +502,7 @@ getdistro () { "iPhone OS") distro="iOS $(sw_vers -productVersion)" + idevice="$(uname -m)" # "uname -m" doesn't print architecture on iOS so we force it off. os_arch="off" @@ -951,8 +952,8 @@ getcpu () { ;; "iPhone OS") - cpu="$(awk -F '|' '/$(uname -m)/ {printf $2}' idevicehw.csv)" - cores="$(awk -F '|' '/$(uname -m)/ {printf $3}' idevicehw.csv)" + cpu="$(awk -F '|' '/$idevice/ {printf $2}' idevicehw.csv)" + cores="$(awk -F '|' '/$idevice/ {printf $3}' idevicehw.csv)" ;; *) @@ -1167,7 +1168,7 @@ getgpu () { ;; "iPhone OS") - gpu="$(awk -F '|' '/$(uname -m)/ {printf $4}' idevicehw.csv)" + gpu="$(awk -F '|' '/$idevice/ {printf $4}' idevicehw.csv)" ;; *"BSD") From a57c3200658991ec2d25a36ced342aa085f4aeda Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 8 May 2016 14:44:15 +1000 Subject: [PATCH 4/6] moved csv into neofetch file directly --- neofetch | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index b53ff6db..d34abf77 100755 --- a/neofetch +++ b/neofetch @@ -952,8 +952,92 @@ getcpu () { ;; "iPhone OS") - cpu="$(awk -F '|' '/$idevice/ {printf $2}' idevicehw.csv)" - cores="$(awk -F '|' '/$idevice/ {printf $3}' idevicehw.csv)" + case "$(uname -m)" in + "iPhone1,1" | "iPhone1,2" | "iPod1,1") + cpu="Samsung S5L8900 @ 412MHz" + cores="1" + ;; + "iPhone2,1") + cpu="Samsung S5PC100 @ 600MHz" + cores="1" + ;; + "iPhone3,1" | "iPhone3,2" | "iPhone3,3" | "iPod4,1") + cpu="Apple A4 @ 800MHz" + cores="1" + ;; + "iPhone4,1" | "iPod5,1") + cpu="Apple A5 @ 800MHz" + cores="2" + ;; + "iPhone5,1" | "iPhone5,2" | "iPhone5,3" | "iPhone5,4") + cpu="Apple A6 @ 1.3GHz" + cores="2" + ;; + "iPhone6,1" | "iPhone6,2") + cpu="Apple A7 @ 1.3GHz" + cores="2" + ;; + "iPhone7,1" | "iPhone7,2") + cpu="Apple A8 @ 1.4GHz" + cores="2" + ;; + "iPhone8,1" | "iPhone8,2" | "iPhone8,4") + cpu="Apple A9 @ 1.85GHz" + cores="2" + ;; + "iPod2,1") + cpu="Samsung S5L8720 @ 533MHz" + cores="1" + ;; + "iPod3,1") + cpu="Samsung S5L8922 @ 600MHz" + cores="1" + ;; + "iPod7,1") + cpu="Apple A8 @ 1.1GHz" + cores="2" + ;; + "iPad1,1") + cpu="Apple A4 @ 1GHz" + cores="1" + ;; + "iPad2,1" | "iPad2,2" | "iPad2,3" | "iPad2,4" | "iPad2,5" | "iPad2,6" | "iPad2,7") + cpu="Apple A5 @ 1GHz" + cores="2" + ;; + "iPad3,1" | "iPad3,2" | "iPad3,3") + cpu="Apple A5X @ 1GHz" + cores="2" + ;; + "iPad3,4" | "iPad3,5" | "iPad3,6") + cpu="Apple A6X @ 1.4GHz" + cores="2" + ;; + "iPad4,1" | "iPad4,2" | "iPad4,3") + cpu="Apple A7 @ 1.4GHz" + cores="2" + ;; + "iPad4,4" | "iPad4,5" | "iPad4,6" | "iPad4,7" | "iPad4,8" | "iPad4,9") + cpu="Apple A7 @ 1.4GHz" + cores="2" + ;; + "iPad5,1" | "iPad5,2") + cpu="Apple A8 @ 1.5GHz" + cores="2" + ;; + "iPad5,3" | "iPad5,4") + cpu="Apple A8X @ 1.5GHz" + cores="3" + ;; + "iPad6,3" | "iPad6,4") + cpu="Apple A9X @ 2.16GHz" + cores="2" + ;; + "iPad6,7" | "iPad6,8") + cpu="Apple A9X @ 2.26GHz" + cores="2" + ;; + esac ;; *) @@ -1168,7 +1252,24 @@ getgpu () { ;; "iPhone OS") - gpu="$(awk -F '|' '/$idevice/ {printf $4}' idevicehw.csv)" + case "$(uname -m)" in + "iPhone1,1" | "iPhone1,2") gpu="PowerVR MBX Lite 3D" ;; + "iPhone2,1" | "iPhone3,1" | "iPhone3,2" | "iPhone3,3" | "iPod3,1" | "iPod4,1" | "iPad1,1") gpu="PowerVR SGX535" ;; + "iPhone4,1" | "iPad2,1" | "iPad2,2" | "iPad2,3" | "iPad2,4" | "iPad2,5" | "iPad2,6" | "iPad2,7" | "iPod5,1") + gpu="PowerVR SGX543MP2" + ;; + "iPhone5,1" | "iPhone5,2" | "iPhone5,3" | "iPhone5,4") gpu="PowerVR SGX543MP3" ;; + "iPhone6,1" | "iPhone6,2" | "iPad4,1" | "iPad4,2" | "iPad4,3" | "iPad4,4" | "iPad4,5" | "iPad4,6" | "iPad4,7" | "iPad4,8" | "iPad4,9") + gpu="PowerVR G6430" + ;; + "iPhone7,1" | "iPhone7,2" | "iPod7,1" | "iPad5,1" | "iPad5,2") gpu="PowerVR GX6450" ;; + "iPhone8,1" | "iPhone8,2" | "iPhone8,4") gpu="PowerVR GT7600" ;; + "iPod1,1" | "iPod2,1") gpu="PowerVR MBX Lite" ;; + "iPad3,1" | "iPad3,2" | "iPad3,3") gpu="PowerVR SGX534MP4" ;; + "iPad3,4" | "iPad3,5" | "iPad3,6") gpu="PowerVR SGX554MP4" ;; + "iPad5,3" | "iPad5,4") gpu="PowerVR GXA6850" ;; + "iPad6,3" | "iPad6,4" | "iPad6,7" | "iPad6,8") gpu="PowerVR 7XT" ;; + esac ;; *"BSD") From 8d83d3b11417b29270854ad997c2d3b7caf933bc Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 8 May 2016 14:48:05 +1000 Subject: [PATCH 5/6] removed csv file as it is now unneeded --- idevicehw.csv | 55 --------------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 idevicehw.csv diff --git a/idevicehw.csv b/idevicehw.csv deleted file mode 100644 index 411bb95b..00000000 --- a/idevicehw.csv +++ /dev/null @@ -1,55 +0,0 @@ -iPhone1,1|Samsung S5L8900 @ 412MHz|1|PowerVR MBX Lite 3D -iPhone1,2|Samsung S5L8900 @ 412MHz|1|PowerVR MBX Lite 3D -iPhone2,1|Samsung S5PC100 @ 600MHz|1|PowerVR SGX535 -iPhone3,1|Apple A4 @ 800MHz|1|PowerVR SGX535 -iPhone3,2|Apple A4 @ 800MHz|1|PowerVR SGX535 -iPhone3,3|Apple A4 @ 800MHz|1|PowerVR SGX535 -iPhone4,1|Apple A5 @ 800MHz|2|PowerVR SGX543MP2 -iPhone5,1|Apple A6 @ 1.3GHz|2|PowerVR SGX543MP3 -iPhone5,2|Apple A6 @ 1.3GHz|2|PowerVR SGX543MP3 -iPhone5,3|Apple A6 @ 1.3GHz|2|PowerVR SGX543MP3 -iPhone5,4|Apple A6 @ 1.3GHz|2|PowerVR SGX543MP3 -iPhone6,1|Apple A7 @ 1.3GHz|2|PowerVR G6430 -iPhone6,2|Apple A7 @ 1.3GHz|2|PowerVR G6430 -iPhone7,1|Apple A8 @ 1.4GHz|2|PowerVR GX6450 -iPhone7,2|Apple A8 @ 1.4GHz|2|PowerVR GX6450 -iPhone8,1|Apple A9 @ 1.85GHz|2|PowerVR GT7600 -iPhone8,2|Apple A9 @ 1.85GHz|2|PowerVR GT7600 -iPhone8,4|Apple A9 @ 1.85GHz|2|PowerVR GT7600 -iPod1,1|Samsung S5L8900 @ 412MHz|1|PowerVR MBX Lite -iPod2,1|Samsung S5L8720 @ 533MHz|1|PowerVR MBX Lite -iPod3,1|Samsung S5L8922 @ 600MHz|1|PowerVR SGX535 -iPod4,1|Apple A4 @ 800MHz|1|PowerVR SGX535 -iPod5,1|Apple A5 @ 800MHz|2|PowerVR SGX543MP2 -iPod7,1|Apple A8 @ 1.1GHz|2|PowerVR GX6450 -iPad1,1|Apple A4 @ 1GHz|1|PowerVR SGX535 -iPad2,1|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 -iPad2,2|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 -iPad2,3|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 -iPad2,4|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 -iPad2,5|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 -iPad2,6|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 -iPad2,7|Apple A5 @ 1GHz|2|PowerVR SGX543MP2 -iPad3,1|Apple A5X @ 1GHz|2|PowerVR SGX543MP4 -iPad3,2|Apple A5X @ 1GHz|2|PowerVR SGX543MP4 -iPad3,3|Apple A5X @ 1GHz|2|PowerVR SGX543MP4 -iPad3,4|Apple A6X @ 1.4GHz|2|PowerVR SGX554MP4 -iPad3,5|Apple A6X @ 1.4GHz|2|PowerVR SGX554MP4 -iPad3,6|Apple A6X @ 1.4GHz|2|PowerVR SGX554MP4 -iPad4,1|Apple A7 @ 1.4GHz|2|PowerVR G6430 -iPad4,2|Apple A7 @ 1.4GHz|2|PowerVR G6430 -iPad4,3|Apple A7 @ 1.4GHz|2|PowerVR G6430 -iPad4,4|Apple A7 @ 1.3GHz|2|PowerVR G6430 -iPad4,5|Apple A7 @ 1.3GHz|2|PowerVR G6430 -iPad4,6|Apple A7 @ 1.3GHz|2|PowerVR G6430 -iPad4,7|Apple A7 @ 1.3GHz|2|PowerVR G6430 -iPad4,8|Apple A7 @ 1.3GHz|2|PowerVR G6430 -iPad4,9|Apple A7 @ 1.3GHz|2|PowerVR G6430 -iPad5,1|Apple A8 @ 1.5GHz|2|PowerVR GX6450 -iPad5,2|Apple A8 @ 1.5GHz|2|PowerVR GX6450 -iPad5,3|Apple A8X @ 1.5GHz|3|PowerVR GXA6850 -iPad5,4|Apple A8X @ 1.5GHz|3|PowerVR GXA6850 -iPad6,3|Apple A9X @ 2.16GHz|2|PowerVR 7XT -iPad6,4|Apple A9X @ 2.16GHz|2|PowerVR 7XT -iPad6,7|Apple A9X @ 2.26GHz|2|PowerVR 7XT -iPad6,8|Apple A9X @ 2.26GHz|2|PowerVR 7XT From 09660208ec076e85ed574ddb2d96a0f25921b7e0 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 8 May 2016 14:50:19 +1000 Subject: [PATCH 6/6] removed unneeded variable --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index d34abf77..82b16ebe 100755 --- a/neofetch +++ b/neofetch @@ -502,7 +502,6 @@ getdistro () { "iPhone OS") distro="iOS $(sw_vers -productVersion)" - idevice="$(uname -m)" # "uname -m" doesn't print architecture on iOS so we force it off. os_arch="off"