From 862b95a65e39c6ab25383b45a80092db43c693b1 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 14 Jun 2021 09:13:46 +0200
Subject: [PATCH] updates

---
 common                         |  2 +-
 patches/browser-confvars.patch |  3 ++-
 pybuild.py                     | 16 ++++++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/common b/common
index 9797e2c..92b53ba 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 9797e2ce7eb4c38ffe1958f516159ee627da39c1
+Subproject commit 92b53ba4f78e870c0404a51961e3eadffda8c258
diff --git a/patches/browser-confvars.patch b/patches/browser-confvars.patch
index 9b40dce..7403a0e 100644
--- a/patches/browser-confvars.patch
+++ b/patches/browser-confvars.patch
@@ -2,13 +2,14 @@ diff --git a/browser/confvars.sh b/browser/confvars.sh
 index 92871c9516..1e151180dd 100644
 --- a/browser/confvars.sh
 +++ b/browser/confvars.sh
-@@ -3,8 +3,10 @@
+@@ -3,8 +3,11 @@
  # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 -MOZ_APP_VENDOR=Mozilla
 -MOZ_UPDATER=1
 +MOZ_APP_BASENAME=LibreWolf
++MOZ_APP_NAME=librewolf
 +MOZ_APP_VENDOR="LibreWolf Community"
 +
 +MOZ_UPDATER=0
diff --git a/pybuild.py b/pybuild.py
index 5686053..b59cf1d 100644
--- a/pybuild.py
+++ b/pybuild.py
@@ -74,7 +74,7 @@ def patch(patchfile):
 
 
 
-def execute_git_subs():
+def execute_update_submodules():
         exec("git submodule update --recursive")
         exec("git submodule foreach git pull origin master")
         exec("git submodule foreach git merge origin master")
@@ -366,7 +366,10 @@ def execute_clean():
 
 def execute_veryclean():
         execute_clean()
-        exec("rm -f librewolf-*.en-US.*.zip librewolf-*.en-US.*-setup.exe sha256sums.txt")
+        exec("rm -f sha256sums.txt")
+        for filename in glob.glob("librewolf-*"):
+                os.remove(filename)
+        
 
 
 
@@ -419,8 +422,8 @@ def main():
 
                         # Utilities
                         
-                        elif arg == 'git_subs':
-                                execute_git_subs()
+                        elif arg == 'update_submodules':
+                                execute_update_submodules()
                         elif arg == 'upload':
                                 execute_upload()
                         
@@ -488,8 +491,9 @@ help_message = """# Use:
 
 # Utilities:
 
-    git_subs    - git update submodules
-    upload      - upload the build artifacts to gitlab.com
+    update_submodules   - git update submodules
+    upload              - upload the build artifacts to gitlab.com
+
     git_init    - put the source folder in a .git repository
     reset       - use git/mercurial to revert changes to a clean state