From 5d96af844527092a45b4339c4626a5690021edee Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 14 Nov 2023 20:13:39 +0100
Subject: [PATCH] Tue Nov 14 08:13:39 PM CET 2023

---
 .gitlab-ci.yml                    |  4 ++++
 Makefile                          |  5 +++--
 scripts/update-settings-module.sh | 20 +++++---------------
 3 files changed, 12 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 scripts/update-settings-module.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91c2a5e..49b373c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,10 @@ stages:
   - release
 
 
+before_script:
+  - git submodule sync --recursive
+  - git submodule update --init --recursive
+
 
 Linux:
   stage: test
diff --git a/Makefile b/Makefile
index c137cd0..31247f4 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,7 @@ help :
 	@echo "docker:" $(docker_targets)
 
 check :
+	-bash -c ./scripts/update-settings-module.sh
 	python3 scripts/update-version.py
 	cut -f1 version > version.tmp
 	mv -vf version.tmp version
@@ -55,9 +56,9 @@ check :
 	@echo "LibreWolf release : " $$(cat release)
 	@echo ""
 
-
 update :
-	git submodule update --recursive --remote
+	-bash -c ./scripts/update-settings-module.sh
+#	git submodule update --recursive --remote
 
 
 all : $(lw_source_tarball)
diff --git a/scripts/update-settings-module.sh b/scripts/update-settings-module.sh
old mode 100644
new mode 100755
index abb22f8..1621361
--- a/scripts/update-settings-module.sh
+++ b/scripts/update-settings-module.sh
@@ -1,22 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# Navigate to the root directory of your repository
-cd /path/to/your/repo
+set -eu
 
-# Update the submodule
-echo "Checking for updates in the settings submodule..."
 cd settings
 git checkout master
 git pull origin master
 cd ..
 
-# Check if there are any changes
-if [ -n "$(git diff --submodule)" ]; then
-    echo "Updates found in the submodule. Committing them..."
-    git add settings
-    git commit -m "Updated settings submodule to the latest version"
-    git push
-    echo "Updates committed and pushed."
-else
-    echo "No updates in the submodule."
-fi
+git add settings
+git commit -m "Updated settings submodule to the latest version"
+git push