diff options
| author |   David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
| commit | 398a42634f34afa1979d88ae1d8b38194e911c2d (patch) | |
| tree | d6a45bdf7b35b71c192602a46e8d98d12a88cb02 /x11-themes | |
| parent | dev-ros/geometric_shapes: Remove old (diff) | |
| download | gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.gz gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.bz2 gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.zip | |
*/*: [QA] Remove redundant `|| die` guards
* Since all ebuilds in the tree are EAPI>=4,
`|| die` on builtin commands is redundant
and dead code.
Closes: https://github.com/gentoo/gentoo/pull/13940
Reviewed-by: Ulrich Müller <ulm@gentoo.org>
Reviewed-by: Michał Górny <mgorny@gentoo.org>
Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-themes')
4 files changed, 15 insertions, 14 deletions
diff --git a/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild b/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild index 1e71574ad87d..7718adab6a51 100644 --- a/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild +++ b/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild @@ -29,10 +29,10 @@ src_test() { :; } src_install() { insinto /usr/share/backgrounds/gentoo10 - doins -r {purple,blue,red}.xml netbook standard wide wider || die + doins -r {purple,blue,red}.xml netbook standard wide wider insinto /usr/share/gnome-background-properties - doins desktop-*.xml || die + doins desktop-*.xml # KDE wallpapers for color in purple blue red; do diff --git a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild index d469a500e013..6d9348d2499c 100644 --- a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild +++ b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild @@ -46,7 +46,7 @@ src_compile() { src_install() { dodir /usr/share/icons insinto /usr/share/icons - doins -r "${WORKDIR}/${PN}" || die "Installing icons failed" + doins -r "${WORKDIR}/${PN}" einstalldocs } diff --git a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild index 78c5094149c1..5fb52b368dcc 100644 --- a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild +++ b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild @@ -31,7 +31,7 @@ src_install() { insinto /usr/share/icons for i in gnome*; do if [ "$i" != "gnome-colors-common" ]; then - doins -r "${i}" || die + doins -r "${i}" fi done einstalldocs diff --git a/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild b/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild index b9f4fccc6099..38dcdb486677 100644 --- a/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild +++ b/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild @@ -62,21 +62,22 @@ src_install() { local backdrops='/usr/share/xfce4/backdrops' local share_home='backgrounds/larry-the-cow' + cd "${DISTDIR}" || die insinto /usr/share/${share_home}/ - ( cd "${DISTDIR}" && doins ${A} ) || die + doins ${A} # Integrate with KDE 4 - dosym ../${share_home} /usr/share/wallpapers/larry-the-cow || die + dosym ../${share_home} /usr/share/wallpapers/larry-the-cow # Integrate with XFCE 4 - dodir ${backdrops}/ || die - dosym ../../${share_home}/gentoo-abducted-1600x1200.png ${backdrops}/gentoo-abducted-4:3.png || die - dosym ../../${share_home}/gentoo-abducted-1280x1024.png ${backdrops}/gentoo-abducted-5:4.png || die - dosym ../../${share_home}/gentoo-abducted-1680x1050.png ${backdrops}/gentoo-abducted-8:5.png || die - dosym ../../${share_home}/gentoo-cow-gdm-remake-1600x1200.png ${backdrops}/gentoo-cow-gdm-remake-4:3.png || die - dosym ../../${share_home}/gentoo-cow-gdm-remake-1280x1024.png ${backdrops}/gentoo-cow-gdm-remake-5:4.png || die - dosym ../../${share_home}/gentoo-cow-gdm-remake-1680x1050.png ${backdrops}/gentoo-cow-gdm-remake-8:5.png || die + dodir ${backdrops}/ + dosym ../../${share_home}/gentoo-abducted-1600x1200.png ${backdrops}/gentoo-abducted-4:3.png + dosym ../../${share_home}/gentoo-abducted-1280x1024.png ${backdrops}/gentoo-abducted-5:4.png + dosym ../../${share_home}/gentoo-abducted-1680x1050.png ${backdrops}/gentoo-abducted-8:5.png + dosym ../../${share_home}/gentoo-cow-gdm-remake-1600x1200.png ${backdrops}/gentoo-cow-gdm-remake-4:3.png + dosym ../../${share_home}/gentoo-cow-gdm-remake-1280x1024.png ${backdrops}/gentoo-cow-gdm-remake-5:4.png + dosym ../../${share_home}/gentoo-cow-gdm-remake-1680x1050.png ${backdrops}/gentoo-cow-gdm-remake-8:5.png for ratio in 4-3 5-4 16-9 16-10 ; do - dosym ../../${share_home}/gentoo-larry-bg-${ratio}.svg ${backdrops}/gentoo-larry-bg-${ratio/-/:}.svg || die + dosym ../../${share_home}/gentoo-larry-bg-${ratio}.svg ${backdrops}/gentoo-larry-bg-${ratio/-/:}.svg done } |