diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-21 23:54:27 +0100 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-21 23:54:27 +0100 |
| commit | 17dbe18913a2051ac3f697af778471975a13253b (patch) | |
| tree | 1228ca549af8b67dda32fb05e5182f296266105c | |
| parent | install ublock origin with PKGBUILD, #106 1/2 (diff) | |
| download | librewolf-linux-17dbe18913a2051ac3f697af778471975a13253b.tar.gz librewolf-linux-17dbe18913a2051ac3f697af778471975a13253b.tar.bz2 librewolf-linux-17dbe18913a2051ac3f697af778471975a13253b.zip | |
install ublock origin with tarball, #106 2/2
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rwxr-xr-x | scripts/02_configure_tarball.sh | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -23,7 +23,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'speech-dispatcher: Text-to-Speech' 'hunspell-en_US: Spell checking, American English') options=(!emptydirs !makeflags !strip) -noextract=("ublock_origin-$pkgver-an+fx.xpi") +noextract=("ublock_origin-$ublockver-an+fx.xpi") source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz $pkgname.desktop "git+https://gitlab.com/${pkgname}-community/browser/common.git" @@ -237,7 +237,7 @@ pref("browser.shell.checkDefaultBrowser", false); pref("extensions.autoDisableScopes", 11); END - install -Dm644 "${srcdir}/ublock_origin-$pkgver-an+fx.xpi" "$pkgdir"/usr/lib/${pkgname}/browser/extensions/uBlock0@raymondhill.net.xpi + install -Dm644 "${srcdir}/ublock_origin-$ublockver-an+fx.xpi" "$pkgdir"/usr/lib/${pkgname}/browser/extensions/uBlock0@raymondhill.net.xpi cp -r ${srcdir}/settings/* ${pkgdir}/usr/lib/${pkgname}/ local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" diff --git a/scripts/02_configure_tarball.sh b/scripts/02_configure_tarball.sh index 32999df..b937cbf 100755 --- a/scripts/02_configure_tarball.sh +++ b/scripts/02_configure_tarball.sh @@ -11,6 +11,8 @@ OUTPUT_TARBALL=$CI_PROJECT_DIR/LibreWolf.${CARCH}.tar.bz2 SOURCE_CODE_BINARY_TARBALL_LOCATION="$CI_PROJECT_DIR/src/firefox-*/obj*/dist/librewolf*.tar.bz2" EXTRACTED_TARBALL_FOLDER=$CI_PROJECT_DIR/librewolf_unpacked/librewolf +_ublockver=1.25.2 + # Prevents build from breaking in CI/CD environments export SHELL=/bin/bash @@ -37,6 +39,8 @@ cp $CI_PROJECT_DIR/content/launch_librewolf.sh $EXTRACTED_TARBALL_FOLDER/launch_ # in all major packages instead cp $_EXTRACTED_TARBALL_FOLDER/settings/* $_EXTRACTED_TARBALL_FOLDER; +install -Dm644 "$CI_PROJECT_DIR/ublock_origin-$_ublockver-an+fx.xpi" "$EXTRACTED_TARBALL_FOLDER"/browser/extensions/uBlock0@raymondhill.net.xpi + # Repacks the binary tarball printf "\nRecompressing binary tarball\n" tar -jvcf $OUTPUT_TARBALL -C $EXTRACTED_TARBALL_FOLDER . |