summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
committerDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
commit398a42634f34afa1979d88ae1d8b38194e911c2d (patch)
treed6a45bdf7b35b71c192602a46e8d98d12a88cb02 /www-apps
parentdev-ros/geometric_shapes: Remove old (diff)
downloadgentoo-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 'www-apps')
-rw-r--r--www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild2
-rw-r--r--www-apps/agendav/agendav-2.2.0.ebuild4
-rw-r--r--www-apps/baikal/baikal-0.5.2.ebuild4
-rw-r--r--www-apps/baikal/baikal-0.6.0.ebuild4
-rw-r--r--www-apps/viewvc/viewvc-1.1.26.ebuild2
-rw-r--r--www-apps/wiliki/wiliki-0.6.1-r1.ebuild10
6 files changed, 13 insertions, 13 deletions
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
index 99bffd1ecaf..29567e33253 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
@@ -38,7 +38,7 @@ src_install() {
perl-module_src_install
webapp_src_preinst
- dodoc Changes INSTALL README TODO UPGRADE || die
+ dodoc Changes INSTALL README TODO UPGRADE
insinto "${MY_ICONSDIR}"/gallery
doins htdocs/*.png
diff --git a/www-apps/agendav/agendav-2.2.0.ebuild b/www-apps/agendav/agendav-2.2.0.ebuild
index ead4966a1fa..80287540c33 100644
--- a/www-apps/agendav/agendav-2.2.0.ebuild
+++ b/www-apps/agendav/agendav-2.2.0.ebuild
@@ -23,12 +23,12 @@ src_install() {
# fix references to the rest of the application code
sed -i -e '/__DIR__/s:/\.\./:/../../agendav/:' web/public/index.php || die
insinto "${MY_HTDOCSDIR}"
- doins -r web/public/* || die
+ doins -r web/public/*
einfo "Installing main files"
cp web/config/{default.,}settings.php || die
insinto "${MY_HOSTROOTDIR}/${PN}"
- doins -r web/{app,config,lang,src,templates,var,vendor} || die
+ doins -r web/{app,config,lang,src,templates,var,vendor}
einfo "Installing agendavcli utility"
sed -i -e '/__DIR__/s:/web/:/:' agendavcli || die
diff --git a/www-apps/baikal/baikal-0.5.2.ebuild b/www-apps/baikal/baikal-0.5.2.ebuild
index a1de2542220..c44cf7d9dda 100644
--- a/www-apps/baikal/baikal-0.5.2.ebuild
+++ b/www-apps/baikal/baikal-0.5.2.ebuild
@@ -25,11 +25,11 @@ S=${WORKDIR}/${PN}
src_install() {
webapp_src_preinst
- dodoc *.md || die "dodoc failed"
+ dodoc *.md
einfo "Installing web files"
insinto "${MY_HTDOCSDIR}"
- doins -r html/* html/.htaccess Core vendor || die "doins failed"
+ doins -r html/* html/.htaccess Core vendor
einfo "Setting up container for configuration"
insinto /etc/${PN}
diff --git a/www-apps/baikal/baikal-0.6.0.ebuild b/www-apps/baikal/baikal-0.6.0.ebuild
index 7984fe26d1e..76fe4e54b4c 100644
--- a/www-apps/baikal/baikal-0.6.0.ebuild
+++ b/www-apps/baikal/baikal-0.6.0.ebuild
@@ -25,11 +25,11 @@ S=${WORKDIR}/${PN}
src_install() {
webapp_src_preinst
- dodoc *.md || die "dodoc failed"
+ dodoc *.md
einfo "Installing web files"
insinto "${MY_HTDOCSDIR}"
- doins -r html/* html/.htaccess Core vendor || die "doins failed"
+ doins -r html/* html/.htaccess Core vendor
einfo "Setting up container for configuration"
insinto /etc/${PN}
diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26.ebuild
index d0627301f12..787b46c0365 100644
--- a/www-apps/viewvc/viewvc-1.1.26.ebuild
+++ b/www-apps/viewvc/viewvc-1.1.26.ebuild
@@ -70,7 +70,7 @@ src_install() {
python_domodule lib/.
insinto "${MY_APPDIR}"
- doins -r templates/ || die "doins failed"
+ doins -r templates/
doins -r templates-contrib/
if use mysql; then
diff --git a/www-apps/wiliki/wiliki-0.6.1-r1.ebuild b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
index 4add1c335f6..b617915fe75 100644
--- a/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
+++ b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
@@ -35,16 +35,16 @@ PATCHES=(
src_install() {
webapp_src_preinst
- emake DESTDIR="${D}" install || die "Install failed"
+ emake DESTDIR="${D}" install
insinto "${MY_CGIBINDIR}"
- doins -r src/wiliki.cgi src/wiliki2.cgi || die "doins failed"
- fperms +x "${MY_CGIBINDIR}"/wiliki.cgi || die "fperms failed"
+ doins -r src/wiliki.cgi src/wiliki2.cgi
+ fperms +x "${MY_CGIBINDIR}"/wiliki.cgi
insinto "${MY_HTDOCSDIR}"
- doins src/wiliki.css src/wiliki2.css || die "doins failed"
+ doins src/wiliki.css src/wiliki2.css
- dodir "${MY_HOSTROOTDIR}"/${PF}/data || die "dodir failed"
+ dodir "${MY_HOSTROOTDIR}"/${PF}/data
webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/data
webapp_src_install