From bcef52621348c03ce1ac8e6291fb5ca197167afe Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Fri, 6 Sep 2019 10:44:06 -0400
Subject: [PATCH] More recognizable OS info in gam version

---
 src/gam.py           | 16 +++++++++++++++-
 src/requirements.txt |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/gam.py b/src/gam.py
index 0869f464..53ce0d6a 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -57,6 +57,8 @@ from urllib.parse import urlencode, urlparse
 from passlib.hash import sha512_crypt
 import dateutil.parser
 
+if platform.system() == 'Linux':
+  import distro
 import googleapiclient
 import googleapiclient.discovery
 import googleapiclient.errors
@@ -800,6 +802,18 @@ def doGAMCheckForUpdates(forceCheck=False):
   except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError, RuntimeError, socket.timeout):
     return
 
+def getOSPlatform():
+  myos = platform.system()
+  if myos == 'Linux':
+    pltfrm = ' '.join(distro.linux_distribution(full_distribution_name=False)).title()
+  elif myos == 'Windows':
+    pltfrm = ' '.join(platform.win32_ver())
+  elif myos == 'Darwin':
+    pltfrm = 'MacOS %s' % platform.mac_ver()[0]
+  else:
+    pltfrm = platform.platform()
+  return '%s %s' % (myos, pltfrm)
+
 def doGAMVersion(checkForArgs=True):
   force_check = extended = simple = timeOffset = False
   testLocation = 'www.googleapis.com'
@@ -832,7 +846,7 @@ def doGAMVersion(checkForArgs=True):
   print(version_data.format(gam_version, GAM_URL, gam_author, sys.version_info[0],
                             sys.version_info[1], sys.version_info[2], struct.calcsize('P')*8,
                             sys.version_info[3], googleapiclient.__version__,
-                            platform.platform(), platform.machine(), GM_Globals[GM_GAM_PATH]))
+                            getOSPlatform(), platform.machine(), GM_Globals[GM_GAM_PATH]))
   if timeOffset:
     offset, nicetime = getLocalGoogleTimeOffset(testLocation)
     print('Your computer is %s off from Google\'s time.' % (nicetime))
diff --git a/src/requirements.txt b/src/requirements.txt
index 9bec2e88..0f098c3e 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,4 +1,5 @@
 python-dateutil
+distro; sys_platform == 'linux'
 google-api-python-client>=1.7.10
 google-auth
 google-auth-httplib2