diff options
author | Louis Sautier <sbraz@gentoo.org> | 2019-07-25 18:39:33 +0200 |
---|---|---|
committer | Louis Sautier <sbraz@gentoo.org> | 2019-07-26 12:20:51 +0200 |
commit | c55605245534154be4d88ce7e123d8559f886699 (patch) | |
tree | a93134f8e120121c0b76cdec755e74f87b1d346f /net-irc | |
parent | app-admin/supervisor: remove slash strip from EAPI=7 ebuilds (diff) | |
download | gentoo-c55605245534154be4d88ce7e123d8559f886699.tar.gz gentoo-c55605245534154be4d88ce7e123d8559f886699.tar.bz2 gentoo-c55605245534154be4d88ce7e123d8559f886699.zip |
net-irc/znc: remove slash strip from EAPI=7 ebuilds
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Louis Sautier <sbraz@gentoo.org>
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/znc/znc-1.7.3.ebuild | 18 | ||||
-rw-r--r-- | net-irc/znc/znc-1.7.4.ebuild | 18 | ||||
-rw-r--r-- | net-irc/znc/znc-9999.ebuild | 18 |
3 files changed, 27 insertions, 27 deletions
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild index 60cd7cf8147f..3bd414de0020 100644 --- a/net-irc/znc/znc-1.7.3.ebuild +++ b/net-irc/znc/znc-1.7.3.ebuild @@ -149,19 +149,19 @@ pkg_postinst() { readme.gentoo_print_elog fi - if [[ -d "${EROOT%/}"/etc/znc ]]; then - ewarn "${EROOT%/}/etc/znc exists on your system." + if [[ -d "${EROOT}"/etc/znc ]]; then + ewarn "${EROOT}/etc/znc exists on your system." ewarn "Due to the nature of the contents of that folder," ewarn "we have changed the default configuration to use" - ewarn " ${EROOT%/}/var/lib/znc" - ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc" + ewarn " ${EROOT}/var/lib/znc" + ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc" ewarn "or adjust your service configuration." fi } pkg_config() { - if [[ -e "${EROOT%/}/var/lib/znc" ]]; then - ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging" + if [[ -e "${EROOT}/var/lib/znc" ]]; then + ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging" ewarn "any existing configuration. If you are sure you want" ewarn "to generate a new configuration, remove the folder" ewarn "and try again." @@ -169,11 +169,11 @@ pkg_config() { einfo "Press enter to interactively create a new configuration file for znc." einfo "To abort, press Control-C" read - mkdir -p "${EROOT%/}/var/lib/znc" || die - chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" || + mkdir -p "${EROOT}/var/lib/znc" || die + chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" || die "Setting permissions failed" start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ - "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || + "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" || die "Config failed" einfo einfo "You can now start the znc service using the init system of your choice." diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild index 9e33853571da..d6e9044033ed 100644 --- a/net-irc/znc/znc-1.7.4.ebuild +++ b/net-irc/znc/znc-1.7.4.ebuild @@ -149,19 +149,19 @@ pkg_postinst() { readme.gentoo_print_elog fi - if [[ -d "${EROOT%/}"/etc/znc ]]; then - ewarn "${EROOT%/}/etc/znc exists on your system." + if [[ -d "${EROOT}"/etc/znc ]]; then + ewarn "${EROOT}/etc/znc exists on your system." ewarn "Due to the nature of the contents of that folder," ewarn "we have changed the default configuration to use" - ewarn " ${EROOT%/}/var/lib/znc" - ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc" + ewarn " ${EROOT}/var/lib/znc" + ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc" ewarn "or adjust your service configuration." fi } pkg_config() { - if [[ -e "${EROOT%/}/var/lib/znc" ]]; then - ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging" + if [[ -e "${EROOT}/var/lib/znc" ]]; then + ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging" ewarn "any existing configuration. If you are sure you want" ewarn "to generate a new configuration, remove the folder" ewarn "and try again." @@ -169,11 +169,11 @@ pkg_config() { einfo "Press enter to interactively create a new configuration file for znc." einfo "To abort, press Control-C" read - mkdir -p "${EROOT%/}/var/lib/znc" || die - chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" || + mkdir -p "${EROOT}/var/lib/znc" || die + chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" || die "Setting permissions failed" start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ - "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || + "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" || die "Config failed" einfo einfo "You can now start the znc service using the init system of your choice." diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index e2a032f9ea5e..6d5656de499d 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -149,19 +149,19 @@ pkg_postinst() { readme.gentoo_print_elog fi - if [[ -d "${EROOT%/}"/etc/znc ]]; then - ewarn "${EROOT%/}/etc/znc exists on your system." + if [[ -d "${EROOT}"/etc/znc ]]; then + ewarn "${EROOT}/etc/znc exists on your system." ewarn "Due to the nature of the contents of that folder," ewarn "we have changed the default configuration to use" - ewarn " ${EROOT%/}/var/lib/znc" - ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc" + ewarn " ${EROOT}/var/lib/znc" + ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc" ewarn "or adjust your service configuration." fi } pkg_config() { - if [[ -e "${EROOT%/}/var/lib/znc" ]]; then - ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging" + if [[ -e "${EROOT}/var/lib/znc" ]]; then + ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid damaging" ewarn "any existing configuration. If you are sure you want" ewarn "to generate a new configuration, remove the folder" ewarn "and try again." @@ -169,11 +169,11 @@ pkg_config() { einfo "Press enter to interactively create a new configuration file for znc." einfo "To abort, press Control-C" read - mkdir -p "${EROOT%/}/var/lib/znc" || die - chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" || + mkdir -p "${EROOT}/var/lib/znc" || die + chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" || die "Setting permissions failed" start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ - "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" || + "${EROOT}"/usr/bin/znc -- --makeconf --datadir "${EROOT}/var/lib/znc" || die "Config failed" einfo einfo "You can now start the znc service using the init system of your choice." |