From 554e896e297e08af9391099ae6e166f12993ac09 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 24 Jan 2022 12:57:44 +0100 Subject: [PATCH] changed to using Settings as a submodule --- .gitmodules | 3 +++ scripts/librewolf-patches.py | 15 +++++++-------- submodules/settings | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .gitmodules create mode 160000 submodules/settings diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..bc0e837 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "submodules/settings"] + path = submodules/settings + url = git@gitlab.com:librewolf-community/settings.git diff --git a/scripts/librewolf-patches.py b/scripts/librewolf-patches.py index f86c8c7..8bc58e3 100755 --- a/scripts/librewolf-patches.py +++ b/scripts/librewolf-patches.py @@ -112,16 +112,15 @@ def librewolf_patches(): exec('mkdir -p lw') - ##! [non-reproducible] This is the moment in time we grab the Settings repo HEAD revision - exec('git clone https://gitlab.com/librewolf-community/settings.git') - exec("cp -v settings/defaults/pref/local-settings.js lw/") - exec("cp -v settings/distribution/policies.json lw/") - exec("cp -v settings/librewolf.cfg lw/") - exec('rm -rf settings') + # getting the librewolf settings repository + exec("cp -v ../submodules/settings/defaults/pref/local-settings.js lw/") + exec("cp -v ../submodules/settings/distribution/policies.json lw/") + exec("cp -v ../submodules/settings/librewolf.cfg lw/") + # provide a script that fetches and bootstraps Nightly and some mozconfigs - exec('cp -v ../scripts/mozfetch.sh lw') - exec('cp -v ../assets/mozconfig.new ../assets/mozconfig.new.without-wasi ../scripts/setup-wasi-linux.sh lw') + exec('cp -v ../scripts/mozfetch.sh lw/') + exec('cp -v ../assets/mozconfig.new ../assets/mozconfig.new.without-wasi ../scripts/setup-wasi-linux.sh lw/') # override the firefox version for file in ["browser/config/version.txt", "browser/config/version_display.txt"]: diff --git a/submodules/settings b/submodules/settings new file mode 160000 index 0000000..c256656 --- /dev/null +++ b/submodules/settings @@ -0,0 +1 @@ +Subproject commit c256656f377d3c15a8c7537c65f45dc802904df7