From bfaa3d869486c108325daac949538f56cb5cd3a6 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Mon, 23 Mar 2020 16:34:55 +0100
Subject: sometimes, it's the little things..

---
 scripts/02_configure_tarball.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/02_configure_tarball.sh b/scripts/02_configure_tarball.sh
index b937cbf..3bdbcaf 100755
--- a/scripts/02_configure_tarball.sh
+++ b/scripts/02_configure_tarball.sh
@@ -27,7 +27,6 @@ tar -xf $OUTPUT_TARBALL -C librewolf_unpacked
 
 # Adds the librefox config files to the packaged tarball
 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";
@@ -37,8 +36,10 @@ cp $CI_PROJECT_DIR/content/launch_librewolf.sh $EXTRACTED_TARBALL_FOLDER/launch_
 # 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;
+printf "\nWorkaround: auto-enable Settings\n"
+cp -r $_EXTRACTED_TARBALL_FOLDER/settings/* $_EXTRACTED_TARBALL_FOLDER;
 
+printf "\nAdd uBlock origin\n"
 install -Dm644 "$CI_PROJECT_DIR/ublock_origin-$_ublockver-an+fx.xpi" "$EXTRACTED_TARBALL_FOLDER"/browser/extensions/uBlock0@raymondhill.net.xpi
 
 # Repacks the binary tarball
-- 
cgit