From fd668d8a74450dd2d05b5c9dcaf62e3de2f0b6f3 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 4 Feb 2021 00:44:17 +0100
Subject: [PATCH] changes

---
 .gitignore  | 3 ++-
 .gitmodules | 3 +++
 build.sh    | 4 +---
 common      | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 160000 common

diff --git a/.gitignore b/.gitignore
index b870e9f..322c7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-firefox-*.tar.xz
+firefox-*
 megabar.patch
 remove_addons.patch
 unity-menubar.patch
+mozconfig
diff --git a/.gitmodules b/.gitmodules
index 1d63467..9e19064 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "settings"]
 	path = settings
 	url = https://gitlab.com/librewolf-community/settings.git
+[submodule "common"]
+	path = common
+	url = https://gitlab.com/librewolf-community/browser/common.git
diff --git a/build.sh b/build.sh
index 7171839..81fd5ab 100644
--- a/build.sh
+++ b/build.sh
@@ -13,9 +13,7 @@ fetch() {
     rm -f firefox-$pkgver.source.tar.xz
     wget https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
     
-    rm -rf settings commmon
-    git clone https://gitlab.com/$pkgname-community/browser/common.git
-    git clone https://gitlab.com/$pkgname-community/settings.git
+    # the settings and common submodules should be checked out to allow the build
 
     rm -f megabar.patch remove_addons.patch unity-menubar.patch
     wget https://gitlab.com/librewolf-community/browser/linux/-/raw/master/megabar.patch
diff --git a/common b/common
new file mode 160000
index 0000000..9995c8b
--- /dev/null
+++ b/common
@@ -0,0 +1 @@
+Subproject commit 9995c8b275e2a06db3e0b24974b302a63791fc24