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-misc | |
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-misc')
-rw-r--r-- | x11-misc/bbrun/bbrun-1.6-r1.ebuild | 2 | ||||
-rw-r--r-- | x11-misc/gmrun/gmrun-0.9.2-r1.ebuild | 2 | ||||
-rw-r--r-- | x11-misc/icewmcp/icewmcp-3.2-r4.ebuild | 2 | ||||
-rw-r--r-- | x11-misc/macopix/macopix-1.7.4-r1.ebuild | 2 | ||||
-rw-r--r-- | x11-misc/peksystray/peksystray-0.4.0.ebuild | 2 | ||||
-rw-r--r-- | x11-misc/screen-message/screen-message-0.24.ebuild | 2 | ||||
-rw-r--r-- | x11-misc/screen-message/screen-message-0.25.ebuild | 2 | ||||
-rw-r--r-- | x11-misc/shutter/shutter-0.93.1-r3.ebuild | 12 | ||||
-rw-r--r-- | x11-misc/shutter/shutter-0.94.3.ebuild | 12 |
9 files changed, 19 insertions, 19 deletions
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild index c4340fdd041d..07fa033e05dc 100644 --- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild +++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild @@ -25,7 +25,7 @@ src_prepare() { } src_compile() { - emake -C ${PN} CC="$(tc-getCC)" || die + emake -C ${PN} CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild index 237b61d4f568..4a0f55c5db3e 100644 --- a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild +++ b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild @@ -35,6 +35,6 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README NEWS } diff --git a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild index 65d5ea53bf13..7304b1186c53 100644 --- a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild +++ b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild @@ -54,7 +54,7 @@ src_install() { for w in "${wraps[@]}" ; do set -- ${w} printf '#!/bin/sh\nexec %s %s/%s\n' "${EPYTHON}" "${dest}" "$1" > "${T}"/$2 - dobin "${T}"/$2 || die + dobin "${T}"/$2 done dodoc ../doc/*.txt diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild index 59e739739fd5..2d547a63583e 100644 --- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild +++ b/x11-misc/macopix/macopix-1.7.4-r1.ebuild @@ -74,7 +74,7 @@ src_install() { cd "${WORKDIR}/${d}" || die insinto /usr/share/"${PN}" for i in *.mcpx *.menu ; do - doins "$i" || die + doins "$i" done insinto /usr/share/"${PN}"/pixmap for i in *.png ; do diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild index 7b9185bd136c..470c7f0efdc0 100644 --- a/x11-misc/peksystray/peksystray-0.4.0.ebuild +++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild @@ -24,6 +24,6 @@ src_prepare() { } src_install() { - dobin src/peksystray || die + dobin src/peksystray default } diff --git a/x11-misc/screen-message/screen-message-0.24.ebuild b/x11-misc/screen-message/screen-message-0.24.ebuild index 660c376e0ee0..9ddb6ea960fd 100644 --- a/x11-misc/screen-message/screen-message-0.24.ebuild +++ b/x11-misc/screen-message/screen-message-0.24.ebuild @@ -20,7 +20,7 @@ RDEPEND="${DEPEND}" src_install() { default - dodir /usr/bin || die + dodir /usr/bin mv "${D}"/usr/{games,bin}/sm || die sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die } diff --git a/x11-misc/screen-message/screen-message-0.25.ebuild b/x11-misc/screen-message/screen-message-0.25.ebuild index f3df7c0075dd..2c0b46504706 100644 --- a/x11-misc/screen-message/screen-message-0.25.ebuild +++ b/x11-misc/screen-message/screen-message-0.25.ebuild @@ -20,7 +20,7 @@ RDEPEND="${DEPEND}" src_install() { default - dodir /usr/bin || die + dodir /usr/bin mv "${D}"/usr/{games,bin}/sm || die sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die } diff --git a/x11-misc/shutter/shutter-0.93.1-r3.ebuild b/x11-misc/shutter/shutter-0.93.1-r3.ebuild index 56732b72603c..e16c4a878a4e 100644 --- a/x11-misc/shutter/shutter-0.93.1-r3.ebuild +++ b/x11-misc/shutter/shutter-0.93.1-r3.ebuild @@ -54,18 +54,18 @@ src_prepare() { } src_install() { - dobin bin/${PN} || die "dobin failed" + dobin bin/${PN} insinto /usr/share/${PN} - doins -r share/${PN}/* || die "doins failed" - dodoc README || die "dodoc failed" + doins -r share/${PN}/* + dodoc README domenu share/applications/${PN}.desktop # Man page is broken. Reconstruct it. gunzip share/man/man1/${PN}.1.gz || die "gunzip failed" - doman share/man/man1/${PN}.1 || die "doman failed" + doman share/man/man1/${PN}.1 doicon share/pixmaps/${PN}.png - doins -r share/locale || die "doins failed" + doins -r share/locale insinto /usr/share/icons/hicolor - doins -r share/icons/hicolor/* || die "doins failed" + doins -r share/icons/hicolor/* find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \ || die "failed to make plugins executables" find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ diff --git a/x11-misc/shutter/shutter-0.94.3.ebuild b/x11-misc/shutter/shutter-0.94.3.ebuild index 1bdd2fcc248d..18f36792dd4b 100644 --- a/x11-misc/shutter/shutter-0.94.3.ebuild +++ b/x11-misc/shutter/shutter-0.94.3.ebuild @@ -51,18 +51,18 @@ src_prepare() { } src_install() { - dobin bin/${PN} || die "dobin failed" + dobin bin/${PN} insinto /usr/share/${PN} - doins -r share/${PN}/* || die "doins failed" - dodoc README || die "dodoc failed" + doins -r share/${PN}/* + dodoc README domenu share/applications/${PN}.desktop # Man page is broken. Reconstruct it. gunzip share/man/man1/${PN}.1.gz || die "gunzip failed" - doman share/man/man1/${PN}.1 || die "doman failed" + doman share/man/man1/${PN}.1 doicon share/pixmaps/${PN}.png - doins -r share/locale || die "doins failed" + doins -r share/locale insinto /usr/share/icons/hicolor - doins -r share/icons/hicolor/* || die "doins failed" + doins -r share/icons/hicolor/* find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \ || die "failed to make plugins executables" find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ |