From ab518c7c2a3923ebad327f2ac656606e93bad509 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Sun, 15 Mar 2020 02:19:42 +0100
Subject: [PATCH] Enable settings by default in Appimage and FlatPak

Crude solution, but this way everything else remains "as is",
so once we tackle the issues with the toggle-settings-script not working
in all situations and re-introduce it, we can do easier switch to that
instead.

Fix (partial only) for #105.
---
 binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 11 ++++++++---
 content/launch_librewolf.sh                          |  5 +----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
index ba34b57..baa0e1f 100755
--- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
+++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
@@ -7,7 +7,7 @@ TOGGLE_SETTINGS_SCRIPT=$2;
 LAUNCHER_SCRIPT=$3;
 _SCRIPT_FOLDER=$(realpath $(dirname $0));
 _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
-_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; 
+_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball
 printf "\nExtracting librewolf binary tarball\n";
@@ -17,11 +17,16 @@ tar -xf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER/..;
 printf "\nCopying librewolf settings to extracted binary tarball\n";
 
 git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings;
+# no need to keep that in there
+rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git";
 cp $TOGGLE_SETTINGS_SCRIPT $_EXTRACTED_TARBALL_FOLDER/settings;
 cp $LAUNCHER_SCRIPT $_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 $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER .;
-
-
diff --git a/content/launch_librewolf.sh b/content/launch_librewolf.sh
index 26c1bd5..b574437 100755
--- a/content/launch_librewolf.sh
+++ b/content/launch_librewolf.sh
@@ -26,7 +26,4 @@ export SNAP_NAME="firefox";
 
 # Launches librewolf
 chmod +x $INSTALL_FOLDER/librewolf;
-$INSTALL_FOLDER/librewolf "$@"; 
-
-
-
+$INSTALL_FOLDER/librewolf "$@";