public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/postfixadmin/
Date: Wed, 15 Aug 2018 07:31:07 +0000 (UTC)	[thread overview]
Message-ID: <1534318258.e39f6eadc4689518133b7afd5ca995260ac9a414.mgorny@gentoo> (raw)

commit:     e39f6eadc4689518133b7afd5ca995260ac9a414
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  9 14:38:38 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 07:30:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e39f6ead

www-apps/postfixadmin: Replace path_exists with inline logic

Replace the call to path_exists with local filename expansion.  While
at it, also kill the ugly ls-abuse in favor of using the results
of earlier expansion.

 www-apps/postfixadmin/postfixadmin-3.1.ebuild | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/www-apps/postfixadmin/postfixadmin-3.1.ebuild b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
index 3e69bc6b657..5cb58aab877 100644
--- a/www-apps/postfixadmin/postfixadmin-3.1.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils user webapp
+inherit user webapp
 
 DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users"
 HOMEPAGE="http://postfixadmin.sourceforge.net"
@@ -89,10 +89,12 @@ pkg_postinst() {
 pkg_postrm() {
 	# Make sure we don't leave broken vacation.pl symlink
 	find -L "${ROOT}"/var/spool/vacation/ -type l -delete
-	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
-		path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
-		ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
-			"${ROOT}"/var/spool/vacation/vacation.pl || die
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local vacation=( "${ROOT}"/var/spool/vacation/vacation.pl-* )
+	${shopt_save}
+	if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl && -n ${vacation[@]} ]]; then
+		ln -s "${vacation[-1]}" "${ROOT}"/var/spool/vacation/vacation.pl || die
 		ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
 		ewarn "recent verion, but please, do your own checks"
 	fi


             reply	other threads:[~2018-08-15  7:31 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-15  7:31 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-24  6:50 [gentoo-commits] repo/gentoo:master commit in: www-apps/postfixadmin/ Miroslav Šulc
2023-01-23 18:08 Sam James
2023-01-23 17:48 Sam James
2022-12-09  8:24 Miroslav Šulc
2022-12-05  8:12 Miroslav Šulc
2022-09-19  7:59 Miroslav Šulc
2022-09-19  6:40 Agostino Sarubbo
2022-09-18 12:36 Miroslav Šulc
2022-03-02 21:42 Miroslav Šulc
2021-08-16  5:20 Miroslav Šulc
2021-08-16  5:13 Agostino Sarubbo
2021-08-09  9:14 Miroslav Šulc
2021-07-29  2:58 Sam James
2021-07-18 18:42 Conrad Kostecki
2021-07-18 18:42 Conrad Kostecki
2021-06-13  6:39 Miroslav Šulc
2021-06-13  6:04 Sam James
2021-05-28 15:57 David Seifert
2021-05-13  8:10 Miroslav Šulc
2021-04-07 12:59 Miroslav Šulc
2021-04-07  6:23 Sam James
2021-03-28 14:29 Miroslav Šulc
2021-03-28 14:03 Sam James
2021-03-05  7:45 Miroslav Šulc
2021-02-18  8:11 Miroslav Šulc
2021-01-28 12:14 Miroslav Šulc
2021-01-20 18:18 Miroslav Šulc
2021-01-15  6:50 Miroslav Šulc
2021-01-14  8:41 Miroslav Šulc
2021-01-11  9:58 Miroslav Šulc
2021-01-11  8:21 Miroslav Šulc
2021-01-11  8:05 Sam James
2021-01-11  8:01 Sam James
2021-01-10 22:27 Sam James
2021-01-10 10:19 Miroslav Šulc
2020-04-17  9:10 Miroslav Šulc
2020-01-23 15:20 Miroslav Šulc
2020-01-23 12:18 Agostino Sarubbo
2020-01-23 10:59 Agostino Sarubbo
2020-01-08  9:19 Jeroen Roovers
2019-12-26 11:19 Miroslav Šulc
2019-12-26 11:19 Miroslav Šulc
2019-12-24  8:08 Agostino Sarubbo
2019-12-23 14:03 Agostino Sarubbo
2019-12-19 19:43 Miroslav Šulc
2019-02-26 19:24 Miroslav Šulc
2018-02-23 12:41 Aaron Swenson
2018-02-12 22:10 Thomas Deutschmann
2017-10-19 21:40 Jonas Stein
2017-08-19 17:52 Aaron Swenson
2017-06-16  1:07 Aaron Swenson
2015-10-13 14:34 Matt Thode
2015-10-13  7:24 Agostino Sarubbo
2015-10-13  7:23 Agostino Sarubbo
2015-10-12 22:32 Matt Thode
2015-10-12 22:25 Matt Thode

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1534318258.e39f6eadc4689518133b7afd5ca995260ac9a414.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox