From 1240cdb7b10b3787f4896c7325fe86c0d154ad55 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 11 Jan 2022 15:44:56 +0100
Subject: [PATCH] bugfixes

---
 mk.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mk.py b/mk.py
index 439a802..6eec0ed 100755
--- a/mk.py
+++ b/mk.py
@@ -25,8 +25,10 @@ def bash(cmd,do_print=True):
     if retval != 0:
         sys.exit(retval)
 
-_native = False # set to True if you don't want the win-specific bash.exe
 def exec(cmd,do_print=True):
+    _native = False
+    if not os.path.isFile('c:/mozilla-build/msys/bin/bash.exe'):
+        _native = True
     if _native:
         return native(cmd,do_print)
     return bash(cmd,do_print)
@@ -141,7 +143,10 @@ def upload(token):
         version = file1.read().rstrip()
         with open('release','r') as file2:
             release = file2.read().rstrip()
-            full_version = '{}.{}'.format(version,release)
+            if release == '0' :
+                full_version = '{}'.format(version)
+            else:
+                full_version = '{}.{}'.format(version,release)
 
             # Files we need to upload..
             zip_filename = 'librewolf-{}.en-US.win64.zip'.format(full_version)