From 2d61f26fb68864924b5fdc859044897cab894b76 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Sat, 21 Mar 2020 21:51:56 +0100
Subject: actually modify the script that is used during builds atm

---
 scripts/02_configure_tarball.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'scripts/02_configure_tarball.sh')

diff --git a/scripts/02_configure_tarball.sh b/scripts/02_configure_tarball.sh
index 8657375..32999df 100755
--- a/scripts/02_configure_tarball.sh
+++ b/scripts/02_configure_tarball.sh
@@ -27,9 +27,16 @@ tar -xf $OUTPUT_TARBALL -C librewolf_unpacked
 printf "\nCopying librewolf settings to extracted binary tarball\n"
 
 cp -r $CI_PROJECT_DIR/src/settings $EXTRACTED_TARBALL_FOLDER/settings
+# no need to keep that in there
+rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git";
 cp $CI_PROJECT_DIR/content/toggle-settings.sh $EXTRACTED_TARBALL_FOLDER/settings
 cp $CI_PROJECT_DIR/content/launch_librewolf.sh $EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh
 
+# Somewhat crude workaround to use settings per default
+# until we've worked out how to use `--install-settings` with links
+# in all major packages instead
+cp $_EXTRACTED_TARBALL_FOLDER/settings/* $_EXTRACTED_TARBALL_FOLDER;
+
 # Repacks the binary tarball
 printf "\nRecompressing binary tarball\n"
 tar -jvcf $OUTPUT_TARBALL -C $EXTRACTED_TARBALL_FOLDER .
-- 
cgit