domi/foxgirl-linux
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Enable settings by default in Appimage and FlatPak

Browse source 
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.
This commit is contained in:
ohfp 2020-03-15 02:19:42 +01:00
parent e3b2751a02
commit ab518c7c2a
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
binary_tarball/scripts/5_Configure_Binary_Tarball.sh
View file

@ -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 .;

5
content/launch_librewolf.sh
View file

@ -26,7 +26,4 @@ export SNAP_NAME="firefox";
# Launches librewolf
chmod +x $INSTALL_FOLDER/librewolf;
$INSTALL_FOLDER/librewolf "$@";
$INSTALL_FOLDER/librewolf "$@";