Skip to content

Commit 02c7c90

Browse files
committed
misc: cleanup
1 parent 9b09ed6 commit 02c7c90

File tree

1 file changed

+82
-75
lines changed

1 file changed

+82
-75
lines changed

neofetch

Lines changed: 82 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,48 +1042,53 @@ get_model() {
10421042

10431043
"iPhone OS")
10441044
case "$kernel_machine" in
1045-
"iPad1,1") model="iPad" ;;
1046-
"iPad2,"[1-4]) model="iPad 2" ;;
1047-
"iPad3,"[1-3]) model="iPad 3" ;;
1048-
"iPad3,"[4-6]) model="iPad 4" ;;
1049-
"iPad6,11" | "iPad 6,12") model="iPad 5" ;;
1050-
"iPad4,"[1-3]) model="iPad Air" ;;
1051-
"iPad5,"[3-4]) model="iPad Air 2" ;;
1052-
"iPad6,"[7-8]) model="iPad Pro (12.9 Inch)" ;;
1053-
"iPad6,"[3-4]) model="iPad Pro (9.7 Inch)" ;;
1054-
"iPad7,"[1-2]) model="iPad Pro 2 (12.9 Inch)" ;;
1055-
"iPad7,"[3-4]) model="iPad Pro (10.5 Inch)" ;;
1056-
"iPad2,"[5-7]) model="iPad mini" ;;
1057-
"iPad4,"[4-6]) model="iPad mini 2" ;;
1058-
"iPad4,"[7-9]) model="iPad mini 3" ;;
1059-
"iPad5,"[1-2]) model="iPad mini 4" ;;
1060-
1061-
"iPhone1,1") model="iPhone" ;;
1062-
"iPhone1,2") model="iPhone 3G" ;;
1063-
"iPhone2,1") model="iPhone 3GS" ;;
1064-
"iPhone3,"[1-3]) model="iPhone 4" ;;
1065-
"iPhone4,1") model="iPhone 4S" ;;
1066-
"iPhone5,"[1-2]) model="iPhone 5" ;;
1067-
"iPhone5,"[3-4]) model="iPhone 5c" ;;
1068-
"iPhone6,"[1-2]) model="iPhone 5s" ;;
1069-
"iPhone7,2") model="iPhone 6" ;;
1070-
"iPhone7,1") model="iPhone 6 Plus" ;;
1071-
"iPhone8,1") model="iPhone 6s" ;;
1072-
"iPhone8,2") model="iPhone 6s Plus" ;;
1073-
"iPhone8,4") model="iPhone SE" ;;
1074-
"iPhone9,1" | "iPhone9,3") model="iPhone 7" ;;
1075-
"iPhone9,2" | "iPhone9,4") model="iPhone 7 Plus" ;;
1076-
"iPhone10,1" | "iPhone10,4") model="iPhone 8" ;;
1077-
"iPhone10,2" | "iPhone10,5") model="iPhone 8 Plus" ;;
1078-
"iPhone10,3" | "iPhone10,6") model="iPhone X" ;;
1079-
1080-
"iPod1,1") model="iPod touch" ;;
1081-
"ipod2,1") model="iPod touch 2G" ;;
1082-
"ipod3,1") model="iPod touch 3G" ;;
1083-
"ipod4,1") model="iPod touch 4G" ;;
1084-
"ipod5,1") model="iPod touch 5G" ;;
1085-
"ipod7,1") model="iPod touch 6G" ;;
1045+
"iPad1,1"): "iPad" ;;
1046+
"iPad2,"[1-4]): "iPad 2" ;;
1047+
"iPad3,"[1-3]): "iPad 3" ;;
1048+
"iPad3,"[4-6]): "iPad 4" ;;
1049+
"iPad4,"[1-3]): "iPad Air" ;;
1050+
"iPad5,"[3-4]): "iPad Air 2" ;;
1051+
"iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;;
1052+
"iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;;
1053+
"iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;;
1054+
"iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;;
1055+
"iPad2,"[5-7]): "iPad mini" ;;
1056+
"iPad4,"[4-6]): "iPad mini 2" ;;
1057+
"iPad4,"[7-9]): "iPad mini 3" ;;
1058+
"iPad5,"[1-2]): "iPad mini 4" ;;
1059+
1060+
"iPad6,11" | "iPad 6,12")
1061+
: "iPad 5"
1062+
;;
1063+
1064+
"iPhone1,1"): "iPhone" ;;
1065+
"iPhone1,2"): "iPhone 3G" ;;
1066+
"iPhone2,1"): "iPhone 3GS" ;;
1067+
"iPhone3,"[1-3]): "iPhone 4" ;;
1068+
"iPhone4,1"): "iPhone 4S" ;;
1069+
"iPhone5,"[1-2]): "iPhone 5" ;;
1070+
"iPhone5,"[3-4]): "iPhone 5c" ;;
1071+
"iPhone6,"[1-2]): "iPhone 5s" ;;
1072+
"iPhone7,2"): "iPhone 6" ;;
1073+
"iPhone7,1"): "iPhone 6 Plus" ;;
1074+
"iPhone8,1"): "iPhone 6s" ;;
1075+
"iPhone8,2"): "iPhone 6s Plus" ;;
1076+
"iPhone8,4"): "iPhone SE" ;;
1077+
1078+
"iPhone9,1" | "iPhone9,3"): "iPhone 7" ;;
1079+
"iPhone9,2" | "iPhone9,4"): "iPhone 7 Plus" ;;
1080+
"iPhone10,1" | "iPhone10,4"): "iPhone 8" ;;
1081+
"iPhone10,2" | "iPhone10,5"): "iPhone 8 Plus" ;;
1082+
"iPhone10,3" | "iPhone10,6"): "iPhone X" ;;
1083+
1084+
"iPod1,1"): "iPod touch" ;;
1085+
"ipod2,1"): "iPod touch 2G" ;;
1086+
"ipod3,1"): "iPod touch 3G" ;;
1087+
"ipod4,1"): "iPod touch 4G" ;;
1088+
"ipod5,1"): "iPod touch 5G" ;;
1089+
"ipod7,1"): "iPod touch 6G" ;;
10861090
esac
1091+
model="$_"
10871092
;;
10881093

10891094
"BSD" | "MINIX")
@@ -1783,29 +1788,30 @@ get_cpu() {
17831788

17841789
"iPhone OS")
17851790
case "$kernel_machine" in
1786-
"iPhone1,"[1-2] | "iPod1,1") cpu="Samsung S5L8900 (1) @ 412MHz" ;;
1787-
"iPhone2,1") cpu="Samsung S5PC100 (1) @ 600MHz" ;;
1788-
"iPhone3,"[1-3] | "iPod4,1") cpu="Apple A4 (1) @ 800MHz" ;;
1789-
"iPhone4,1" | "iPod5,1") cpu="Apple A5 (2) @ 800MHz" ;;
1790-
"iPhone5,"[1-4]) cpu="Apple A6 (2) @ 1.3GHz" ;;
1791-
"iPhone6,"[1-2]) cpu="Apple A7 (2) @ 1.3GHz" ;;
1792-
"iPhone7,"[1-2]) cpu="Apple A8 (2) @ 1.4GHz" ;;
1793-
"iPhone8,"[1-4]) cpu="Apple A9 (2) @ 1.85GHz" ;;
1794-
"iPhone9,"[1-4]) cpu="Apple A10 Fusion (4) @ 2.34GHz" ;;
1795-
"iPod2,1") cpu="Samsung S5L8720 (1) @ 533MHz" ;;
1796-
"iPod3,1") cpu="Samsung S5L8922 (1) @ 600MHz" ;;
1797-
"iPod7,1") cpu="Apple A8 (2) @ 1.1GHz" ;;
1798-
"iPad1,1") cpu="Apple A4 (1) @ 1GHz" ;;
1799-
"iPad2,"[1-7]) cpu="Apple A5 (2) @ 1GHz" ;;
1800-
"iPad3,"[1-3]) cpu="Apple A5X (2) @ 1GHz" ;;
1801-
"iPad3,"[4-6]) cpu="Apple A6X (2) @ 1.4GHz" ;;
1802-
"iPad4,"[1-3]) cpu="Apple A7 (2) @ 1.4GHz" ;;
1803-
"iPad4,"[4-9]) cpu="Apple A7 (2) @ 1.4GHz" ;;
1804-
"iPad5,"[1-2]) cpu="Apple A8 (2) @ 1.5GHz" ;;
1805-
"iPad5,"[3-4]) cpu="Apple A8X (3) @ 1.5GHz" ;;
1806-
"iPad6,"[3-4]) cpu="Apple A9X (2) @ 2.16GHz" ;;
1807-
"iPad6,"[7-8]) cpu="Apple A9X (2) @ 2.26GHz" ;;
1791+
"iPhone1,"[1-2] | "iPod1,1"): "Samsung S5L8900 (1) @ 412MHz" ;;
1792+
"iPhone2,1"): "Samsung S5PC100 (1) @ 600MHz" ;;
1793+
"iPhone3,"[1-3] | "iPod4,1"): "Apple A4 (1) @ 800MHz" ;;
1794+
"iPhone4,1" | "iPod5,1"): "Apple A5 (2) @ 800MHz" ;;
1795+
"iPhone5,"[1-4]): "Apple A6 (2) @ 1.3GHz" ;;
1796+
"iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;;
1797+
"iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;;
1798+
"iPhone8,"[1-4]): "Apple A9 (2) @ 1.85GHz" ;;
1799+
"iPhone9,"[1-4]): "Apple A10 Fusion (4) @ 2.34GHz" ;;
1800+
"iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;;
1801+
"iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;;
1802+
"iPod7,1"): "Apple A8 (2) @ 1.1GHz" ;;
1803+
"iPad1,1"): "Apple A4 (1) @ 1GHz" ;;
1804+
"iPad2,"[1-7]): "Apple A5 (2) @ 1GHz" ;;
1805+
"iPad3,"[1-3]): "Apple A5X (2) @ 1GHz" ;;
1806+
"iPad3,"[4-6]): "Apple A6X (2) @ 1.4GHz" ;;
1807+
"iPad4,"[1-3]): "Apple A7 (2) @ 1.4GHz" ;;
1808+
"iPad4,"[4-9]): "Apple A7 (2) @ 1.4GHz" ;;
1809+
"iPad5,"[1-2]): "Apple A8 (2) @ 1.5GHz" ;;
1810+
"iPad5,"[3-4]): "Apple A8X (3) @ 1.5GHz" ;;
1811+
"iPad6,"[3-4]): "Apple A9X (2) @ 2.16GHz" ;;
1812+
"iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;;
18081813
esac
1814+
cpu="$_"
18091815
;;
18101816

18111817
"BSD")
@@ -2099,34 +2105,35 @@ get_gpu() {
20992105

21002106
"iPhone OS")
21012107
case "$kernel_machine" in
2102-
"iPhone1,"[1-2]) gpu="PowerVR MBX Lite 3D" ;;
2103-
"iPhone5,"[1-4]) gpu="PowerVR SGX543MP3" ;;
2104-
"iPhone8,"[1-4]) gpu="PowerVR GT7600" ;;
2105-
"iPad3,"[1-3]) gpu="PowerVR SGX534MP4" ;;
2106-
"iPad3,"[4-6]) gpu="PowerVR SGX554MP4" ;;
2107-
"iPad5,"[3-4]) gpu="PowerVR GXA6850" ;;
2108-
"iPad6,"[3-8]) gpu="PowerVR 7XT" ;;
2108+
"iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;;
2109+
"iPhone5,"[1-4]): "PowerVR SGX543MP3" ;;
2110+
"iPhone8,"[1-4]): "PowerVR GT7600" ;;
2111+
"iPad3,"[1-3]): "PowerVR SGX534MP4" ;;
2112+
"iPad3,"[4-6]): "PowerVR SGX554MP4" ;;
2113+
"iPad5,"[3-4]): "PowerVR GXA6850" ;;
2114+
"iPad6,"[3-8]): "PowerVR 7XT" ;;
21092115

21102116
"iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1")
2111-
gpu="PowerVR SGX535"
2117+
: "PowerVR SGX535"
21122118
;;
21132119

21142120
"iPhone4,1" | "iPad2,"[1-7] | "iPod5,1")
2115-
gpu="PowerVR SGX543MP2"
2121+
: "PowerVR SGX543MP2"
21162122
;;
21172123

21182124
"iPhone6,"[1-2] | "iPad4,"[1-9])
2119-
gpu="PowerVR G6430"
2125+
: "PowerVR G6430"
21202126
;;
21212127

21222128
"iPhone7,"[1-2] | "iPod7,1" | "iPad5,"[1-2])
2123-
gpu="PowerVR GX6450"
2129+
: "PowerVR GX6450"
21242130
;;
21252131

21262132
"iPod1,1" | "iPod2,1")
2127-
gpu="PowerVR MBX Lite"
2133+
: "PowerVR MBX Lite"
21282134
;;
21292135
esac
2136+
gpu="$_"
21302137
;;
21312138

21322139
"Windows")

0 commit comments

Comments
 (0)