From a2beefd77fb3bb50dc6bfc96b5ed55b974b53999 Mon Sep 17 00:00:00 2001
From: Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
Date: Thu, 11 Feb 2021 11:35:42 -0300
Subject: [PATCH] Updated deploy scripts.

---
 ports/deploy/deploy_mac.py           | 17 +----------------
 ports/deploy/deploy_posix.py         | 17 +----------------
 ports/deploy/deploy_posix_windows.py | 17 +----------------
 ports/deploy/deploy_windows.py       | 17 +----------------
 4 files changed, 4 insertions(+), 64 deletions(-)

diff --git a/ports/deploy/deploy_mac.py b/ports/deploy/deploy_mac.py
index a195408..11c4104 100644
--- a/ports/deploy/deploy_mac.py
+++ b/ports/deploy/deploy_mac.py
@@ -79,21 +79,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
         print('\nSigning bundle\n')
         self.signPackage(self.appBundleDir)
 
-    def commitHash(self):
-        try:
-            process = subprocess.Popen(['git', 'rev-parse', 'HEAD'], # nosec
-                                        stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE,
-                                        cwd=self.rootDir)
-            stdout, _ = process.communicate()
-
-            if process.returncode != 0:
-                return ''
-
-            return stdout.decode(sys.getdefaultencoding()).strip()
-        except:
-            return ''
-
     @staticmethod
     def sysInfo():
         process = subprocess.Popen(['sw_vers'], # nosec
@@ -121,7 +106,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
         # Write repository info.
 
         with open(depsInfoFile, 'w') as f:
-            commitHash = self.commitHash()
+            commitHash = self.gitCommitHash(self.rootDir)
 
             if len(commitHash) < 1:
                 commitHash = 'Unknown'
diff --git a/ports/deploy/deploy_posix.py b/ports/deploy/deploy_posix.py
index 655f57f..9a6ebaa 100644
--- a/ports/deploy/deploy_posix.py
+++ b/ports/deploy/deploy_posix.py
@@ -203,21 +203,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
 
         return ''
 
-    def commitHash(self):
-        try:
-            process = subprocess.Popen(['git', 'rev-parse', 'HEAD'], # nosec
-                                        stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE,
-                                        cwd=self.rootDir)
-            stdout, _ = process.communicate()
-
-            if process.returncode != 0:
-                return ''
-
-            return stdout.decode(sys.getdefaultencoding()).strip()
-        except:
-            return ''
-
     @staticmethod
     def sysInfo():
         info = ''
@@ -248,7 +233,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
         # Write repository info.
 
         with open(depsInfoFile, 'w') as f:
-            commitHash = self.commitHash()
+            commitHash = self.gitCommitHash(self.rootDir)
 
             if len(commitHash) < 1:
                 commitHash = 'Unknown'
diff --git a/ports/deploy/deploy_posix_windows.py b/ports/deploy/deploy_posix_windows.py
index 3d9caa5..b5d3693 100644
--- a/ports/deploy/deploy_posix_windows.py
+++ b/ports/deploy/deploy_posix_windows.py
@@ -108,21 +108,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
         print('\nWritting build system information\n')
         self.writeBuildInfo()
 
-    def commitHash(self):
-        try:
-            process = subprocess.Popen(['git', 'rev-parse', 'HEAD'], # nosec
-                                        stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE,
-                                        cwd=self.rootDir)
-            stdout, _ = process.communicate()
-
-            if process.returncode != 0:
-                return ''
-
-            return stdout.decode(sys.getdefaultencoding()).strip()
-        except:
-            return ''
-
     @staticmethod
     def sysInfo():
         info = ''
@@ -152,7 +137,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
         # Write repository info.
 
         with open(depsInfoFile, 'w') as f:
-            commitHash = self.commitHash()
+            commitHash = self.gitCommitHash(self.rootDir)
 
             if len(commitHash) < 1:
                 commitHash = 'Unknown'
diff --git a/ports/deploy/deploy_windows.py b/ports/deploy/deploy_windows.py
index 779a018..4051727 100644
--- a/ports/deploy/deploy_windows.py
+++ b/ports/deploy/deploy_windows.py
@@ -115,21 +115,6 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
         for afile in afiles:
             os.remove(afile)
 
-    def commitHash(self):
-        try:
-            process = subprocess.Popen(['git', 'rev-parse', 'HEAD'], # nosec
-                                        stdout=subprocess.PIPE,
-                                        stderr=subprocess.PIPE,
-                                        cwd=self.rootDir)
-            stdout, _ = process.communicate()
-
-            if process.returncode != 0:
-                return ''
-
-            return stdout.decode(sys.getdefaultencoding()).strip()
-        except:
-            return ''
-
     @staticmethod
     def sysInfo():
         try:
@@ -163,7 +148,7 @@ class Deploy(DTDeployBase.DeployBase, DTQt5.Qt5Tools):
         # Write repository info.
 
         with open(depsInfoFile, 'w') as f:
-            commitHash = self.commitHash()
+            commitHash = self.gitCommitHash(self.rootDir)
 
             if len(commitHash) < 1:
                 commitHash = 'Unknown'