diff --git a/neofetch b/neofetch index a4b94cd3..fac82d4b 100755 --- a/neofetch +++ b/neofetch @@ -1042,48 +1042,53 @@ get_model() { "iPhone OS") case "$kernel_machine" in - "iPad1,1") model="iPad" ;; - "iPad2,"[1-4]) model="iPad 2" ;; - "iPad3,"[1-3]) model="iPad 3" ;; - "iPad3,"[4-6]) model="iPad 4" ;; - "iPad6,11" | "iPad 6,12") model="iPad 5" ;; - "iPad4,"[1-3]) model="iPad Air" ;; - "iPad5,"[3-4]) model="iPad Air 2" ;; - "iPad6,"[7-8]) model="iPad Pro (12.9 Inch)" ;; - "iPad6,"[3-4]) model="iPad Pro (9.7 Inch)" ;; - "iPad7,"[1-2]) model="iPad Pro 2 (12.9 Inch)" ;; - "iPad7,"[3-4]) model="iPad Pro (10.5 Inch)" ;; - "iPad2,"[5-7]) model="iPad mini" ;; - "iPad4,"[4-6]) model="iPad mini 2" ;; - "iPad4,"[7-9]) model="iPad mini 3" ;; - "iPad5,"[1-2]) model="iPad mini 4" ;; + "iPad1,1"): "iPad" ;; + "iPad2,"[1-4]): "iPad 2" ;; + "iPad3,"[1-3]): "iPad 3" ;; + "iPad3,"[4-6]): "iPad 4" ;; + "iPad4,"[1-3]): "iPad Air" ;; + "iPad5,"[3-4]): "iPad Air 2" ;; + "iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;; + "iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;; + "iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;; + "iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;; + "iPad2,"[5-7]): "iPad mini" ;; + "iPad4,"[4-6]): "iPad mini 2" ;; + "iPad4,"[7-9]): "iPad mini 3" ;; + "iPad5,"[1-2]): "iPad mini 4" ;; - "iPhone1,1") model="iPhone" ;; - "iPhone1,2") model="iPhone 3G" ;; - "iPhone2,1") model="iPhone 3GS" ;; - "iPhone3,"[1-3]) model="iPhone 4" ;; - "iPhone4,1") model="iPhone 4S" ;; - "iPhone5,"[1-2]) model="iPhone 5" ;; - "iPhone5,"[3-4]) model="iPhone 5c" ;; - "iPhone6,"[1-2]) model="iPhone 5s" ;; - "iPhone7,2") model="iPhone 6" ;; - "iPhone7,1") model="iPhone 6 Plus" ;; - "iPhone8,1") model="iPhone 6s" ;; - "iPhone8,2") model="iPhone 6s Plus" ;; - "iPhone8,4") model="iPhone SE" ;; - "iPhone9,1" | "iPhone9,3") model="iPhone 7" ;; - "iPhone9,2" | "iPhone9,4") model="iPhone 7 Plus" ;; - "iPhone10,1" | "iPhone10,4") model="iPhone 8" ;; - "iPhone10,2" | "iPhone10,5") model="iPhone 8 Plus" ;; - "iPhone10,3" | "iPhone10,6") model="iPhone X" ;; + "iPad6,11" | "iPad 6,12") + : "iPad 5" + ;; - "iPod1,1") model="iPod touch" ;; - "ipod2,1") model="iPod touch 2G" ;; - "ipod3,1") model="iPod touch 3G" ;; - "ipod4,1") model="iPod touch 4G" ;; - "ipod5,1") model="iPod touch 5G" ;; - "ipod7,1") model="iPod touch 6G" ;; + "iPhone1,1"): "iPhone" ;; + "iPhone1,2"): "iPhone 3G" ;; + "iPhone2,1"): "iPhone 3GS" ;; + "iPhone3,"[1-3]): "iPhone 4" ;; + "iPhone4,1"): "iPhone 4S" ;; + "iPhone5,"[1-2]): "iPhone 5" ;; + "iPhone5,"[3-4]): "iPhone 5c" ;; + "iPhone6,"[1-2]): "iPhone 5s" ;; + "iPhone7,2"): "iPhone 6" ;; + "iPhone7,1"): "iPhone 6 Plus" ;; + "iPhone8,1"): "iPhone 6s" ;; + "iPhone8,2"): "iPhone 6s Plus" ;; + "iPhone8,4"): "iPhone SE" ;; + + "iPhone9,1" | "iPhone9,3"): "iPhone 7" ;; + "iPhone9,2" | "iPhone9,4"): "iPhone 7 Plus" ;; + "iPhone10,1" | "iPhone10,4"): "iPhone 8" ;; + "iPhone10,2" | "iPhone10,5"): "iPhone 8 Plus" ;; + "iPhone10,3" | "iPhone10,6"): "iPhone X" ;; + + "iPod1,1"): "iPod touch" ;; + "ipod2,1"): "iPod touch 2G" ;; + "ipod3,1"): "iPod touch 3G" ;; + "ipod4,1"): "iPod touch 4G" ;; + "ipod5,1"): "iPod touch 5G" ;; + "ipod7,1"): "iPod touch 6G" ;; esac + model="$_" ;; "BSD" | "MINIX") @@ -1783,29 +1788,30 @@ get_cpu() { "iPhone OS") case "$kernel_machine" in - "iPhone1,"[1-2] | "iPod1,1") cpu="Samsung S5L8900 (1) @ 412MHz" ;; - "iPhone2,1") cpu="Samsung S5PC100 (1) @ 600MHz" ;; - "iPhone3,"[1-3] | "iPod4,1") cpu="Apple A4 (1) @ 800MHz" ;; - "iPhone4,1" | "iPod5,1") cpu="Apple A5 (2) @ 800MHz" ;; - "iPhone5,"[1-4]) cpu="Apple A6 (2) @ 1.3GHz" ;; - "iPhone6,"[1-2]) cpu="Apple A7 (2) @ 1.3GHz" ;; - "iPhone7,"[1-2]) cpu="Apple A8 (2) @ 1.4GHz" ;; - "iPhone8,"[1-4]) cpu="Apple A9 (2) @ 1.85GHz" ;; - "iPhone9,"[1-4]) cpu="Apple A10 Fusion (4) @ 2.34GHz" ;; - "iPod2,1") cpu="Samsung S5L8720 (1) @ 533MHz" ;; - "iPod3,1") cpu="Samsung S5L8922 (1) @ 600MHz" ;; - "iPod7,1") cpu="Apple A8 (2) @ 1.1GHz" ;; - "iPad1,1") cpu="Apple A4 (1) @ 1GHz" ;; - "iPad2,"[1-7]) cpu="Apple A5 (2) @ 1GHz" ;; - "iPad3,"[1-3]) cpu="Apple A5X (2) @ 1GHz" ;; - "iPad3,"[4-6]) cpu="Apple A6X (2) @ 1.4GHz" ;; - "iPad4,"[1-3]) cpu="Apple A7 (2) @ 1.4GHz" ;; - "iPad4,"[4-9]) cpu="Apple A7 (2) @ 1.4GHz" ;; - "iPad5,"[1-2]) cpu="Apple A8 (2) @ 1.5GHz" ;; - "iPad5,"[3-4]) cpu="Apple A8X (3) @ 1.5GHz" ;; - "iPad6,"[3-4]) cpu="Apple A9X (2) @ 2.16GHz" ;; - "iPad6,"[7-8]) cpu="Apple A9X (2) @ 2.26GHz" ;; + "iPhone1,"[1-2] | "iPod1,1"): "Samsung S5L8900 (1) @ 412MHz" ;; + "iPhone2,1"): "Samsung S5PC100 (1) @ 600MHz" ;; + "iPhone3,"[1-3] | "iPod4,1"): "Apple A4 (1) @ 800MHz" ;; + "iPhone4,1" | "iPod5,1"): "Apple A5 (2) @ 800MHz" ;; + "iPhone5,"[1-4]): "Apple A6 (2) @ 1.3GHz" ;; + "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;; + "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; + "iPhone8,"[1-4]): "Apple A9 (2) @ 1.85GHz" ;; + "iPhone9,"[1-4]): "Apple A10 Fusion (4) @ 2.34GHz" ;; + "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; + "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; + "iPod7,1"): "Apple A8 (2) @ 1.1GHz" ;; + "iPad1,1"): "Apple A4 (1) @ 1GHz" ;; + "iPad2,"[1-7]): "Apple A5 (2) @ 1GHz" ;; + "iPad3,"[1-3]): "Apple A5X (2) @ 1GHz" ;; + "iPad3,"[4-6]): "Apple A6X (2) @ 1.4GHz" ;; + "iPad4,"[1-3]): "Apple A7 (2) @ 1.4GHz" ;; + "iPad4,"[4-9]): "Apple A7 (2) @ 1.4GHz" ;; + "iPad5,"[1-2]): "Apple A8 (2) @ 1.5GHz" ;; + "iPad5,"[3-4]): "Apple A8X (3) @ 1.5GHz" ;; + "iPad6,"[3-4]): "Apple A9X (2) @ 2.16GHz" ;; + "iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;; esac + cpu="$_" ;; "BSD") @@ -2099,34 +2105,35 @@ get_gpu() { "iPhone OS") case "$kernel_machine" in - "iPhone1,"[1-2]) gpu="PowerVR MBX Lite 3D" ;; - "iPhone5,"[1-4]) gpu="PowerVR SGX543MP3" ;; - "iPhone8,"[1-4]) gpu="PowerVR GT7600" ;; - "iPad3,"[1-3]) gpu="PowerVR SGX534MP4" ;; - "iPad3,"[4-6]) gpu="PowerVR SGX554MP4" ;; - "iPad5,"[3-4]) gpu="PowerVR GXA6850" ;; - "iPad6,"[3-8]) gpu="PowerVR 7XT" ;; + "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; + "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; + "iPhone8,"[1-4]): "PowerVR GT7600" ;; + "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; + "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; + "iPad5,"[3-4]): "PowerVR GXA6850" ;; + "iPad6,"[3-8]): "PowerVR 7XT" ;; "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1") - gpu="PowerVR SGX535" + : "PowerVR SGX535" ;; "iPhone4,1" | "iPad2,"[1-7] | "iPod5,1") - gpu="PowerVR SGX543MP2" + : "PowerVR SGX543MP2" ;; "iPhone6,"[1-2] | "iPad4,"[1-9]) - gpu="PowerVR G6430" + : "PowerVR G6430" ;; "iPhone7,"[1-2] | "iPod7,1" | "iPad5,"[1-2]) - gpu="PowerVR GX6450" + : "PowerVR GX6450" ;; "iPod1,1" | "iPod2,1") - gpu="PowerVR MBX Lite" + : "PowerVR MBX Lite" ;; esac + gpu="$_" ;; "Windows")