From 6c4583696ef1eb22b49c39021be17d1c68439562 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 25 Oct 2016 21:51:29 -0300 Subject: ice{dove,weasel}-hardening: minor fix --- pcr/icedove-hardening/PKGBUILD | 2 +- pcr/iceweasel-hardening/PKGBUILD | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pcr/icedove-hardening/PKGBUILD b/pcr/icedove-hardening/PKGBUILD index 6ce8d46eb..d907a1f24 100644 --- a/pcr/icedove-hardening/PKGBUILD +++ b/pcr/icedove-hardening/PKGBUILD @@ -187,7 +187,7 @@ package() { install -Dm644 "$brandingdir/${pkgname%-*}$i.png" \ "$icondir/${i}x${i}/apps/${pkgname%-*}.png" done - install -Dm644 "$brandingdir/${pkgname}big.svg" \ + install -Dm644 "$brandingdir/${pkgname%-*}big.svg" \ "$icondir/scalable/apps/${pkgname%-*}.svg" # Install Icedove desktop diff --git a/pcr/iceweasel-hardening/PKGBUILD b/pcr/iceweasel-hardening/PKGBUILD index 790b18177..1c410fb6c 100644 --- a/pcr/iceweasel-hardening/PKGBUILD +++ b/pcr/iceweasel-hardening/PKGBUILD @@ -53,8 +53,8 @@ provides=("${pkgname%-*}") install=${pkgname%-*}.install source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz" "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz" - "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz" - "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig" + "$_parabolarepo/${pkgname%-*}_$_brandingver-$_brandingrel.branding.tar.xz" + "$_parabolarepo/${pkgname%-*}_$_brandingver-$_brandingrel.branding.tar.xz.sig" mozconfig libre.patch remove-default-and-shell-icons-in-packaging-manifest.patch @@ -189,13 +189,13 @@ package() { brandingdir=moz-objdir/$_brandingdir icondir="$pkgdir/usr/share/icons/hicolor" for i in 16 22 24 32 48 64 128 192 256 384; do - rsvg-convert -w $i -h $i "$_brandingdir/${pkgname}_icon.svg" \ + rsvg-convert -w $i -h $i "$_brandingdir/${pkgname%-*}_icon.svg" \ -o "$brandingdir/default$i.png" install -Dm644 "$brandingdir/default$i.png" \ "$icondir/${i}x${i}/apps/${pkgname%-*}.png" done - install -Dm644 "$_brandingdir/${pkgname}_icon.svg" \ + install -Dm644 "$_brandingdir/${pkgname%-*}_icon.svg" \ "$icondir/scalable/apps/${pkgname%-*}.svg" install -d "$pkgdir/usr/share/applications" -- cgit v1.2.3