From 7a17c3fc117817462f615b34126af8c2e291cfca Mon Sep 17 00:00:00 2001
From: CorpNewt <12772521+corpnewt@users.noreply.github.com>
Date: Mon, 22 Jun 2020 15:08:36 -0500
Subject: [PATCH] Get name from 10.16 - credit to dhinakg
https://github.com/dhinakg
---
gibMacOS.command | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/gibMacOS.command b/gibMacOS.command
index 0aa32c4..d08b5ce 100755
--- a/gibMacOS.command
+++ b/gibMacOS.command
@@ -1,6 +1,6 @@
#!/usr/bin/env python
from Scripts import *
-import os, datetime, shutil, time, sys, argparse
+import os, datetime, shutil, time, sys, argparse, re
class gibMacOS:
def __init__(self):
@@ -150,7 +150,7 @@ class gibMacOS:
return mac_prods
def get_build_version(self, dist_dict):
- build = version = "Unknown"
+ build = version = name = "Unknown"
try:
dist_url = dist_dict.get("English","") if dist_dict.get("English",None) else dist_dict.get("en","")
dist_file = self.d.get_bytes(dist_url, False).decode("utf-8")
@@ -167,7 +167,11 @@ class gibMacOS:
version = dist_file.split("{}".format(vers_search))[1].split("")[1].split("")[0]
except:
pass
- return (build,version)
+ try:
+ name = re.search(r"(.+?)",dist_file).group(1)
+ except:
+ pass
+ return (build,version,name)
def get_dict_for_prods(self, prods, plist_dict = None):
if plist_dict==self.catalog_data==None:
@@ -209,7 +213,8 @@ class gibMacOS:
# Add them all!
prodd["packages"] = plist_dict.get("Products",{}).get(prod,{}).get("Packages",[])
# Attempt to get the build/version info from the dist
- b,v = self.get_build_version(plist_dict.get("Products",{}).get(prod,{}).get("Distributions",{}))
+ b,v,n = self.get_build_version(plist_dict.get("Products",{}).get(prod,{}).get("Distributions",{}))
+ prodd["title"] = smd.get("localization",{}).get("English",{}).get("title",n)
prodd["build"] = b
if not v.lower() == "unknown":
prodd["version"] = v