aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorohfp <1813007-ohfp@users.noreply.gitlab.com>2020-03-23 16:34:55 +0100
committerohfp <1813007-ohfp@users.noreply.gitlab.com>2020-03-23 16:34:55 +0100
commitbfaa3d869486c108325daac949538f56cb5cd3a6 (patch)
tree1649c012f1aabe53ea0c244b176170054c2f08cf
parentskip automatic release for now; #99 (diff)
downloadlibrewolf-linux-bfaa3d869486c108325daac949538f56cb5cd3a6.tar.gz
librewolf-linux-bfaa3d869486c108325daac949538f56cb5cd3a6.tar.bz2
librewolf-linux-bfaa3d869486c108325daac949538f56cb5cd3a6.zip
sometimes, it's the little things..
-rwxr-xr-xscripts/02_configure_tarball.sh5
1 files changed, 3 insertions, 2 deletions
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
bgstack15