Date: Tue, 10 Jan 2017 08:14:53 -0700 From: Adam Weinberger <adamw@adamw.org> To: Tijl Coosemans <tijl@freebsd.org> Cc: Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r431051 - in head/security/gnupg20: . files Message-ID: <95A8F085-783E-4EA7-B0F3-B47B0DCE7423@adamw.org> In-Reply-To: <20170110115913.3acb4642@kalimero.tijl.coosemans.org> References: <201701100234.v0A2YXP8023349@repo.freebsd.org> <20170110115913.3acb4642@kalimero.tijl.coosemans.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 10 Jan, 2017, at 3:59, Tijl Coosemans <tijl@freebsd.org> wrote: >=20 > On Tue, 10 Jan 2017 02:34:33 +0000 (UTC) Adam Weinberger = <adamw@FreeBSD.org> wrote: >> @@ -112,4 +111,5 @@ sbin/applygnupgdefaults >> %%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo >> %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo >> %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo >> -@unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true >> +@postexec [ -e %D/bin/gpg ] || ln -s gpg2 %D/bin/gpg >=20 > When %D/bin/gpg is a symlink -e will test if the target exists so ln > may be executed with %D/bin/gpg a symlink to a nonexistent file which > means you should use "ln -sf" so ln can replace the dead link. >=20 >> +@postunexec [ "$(readlink %D/bin/gpg)" =3D "gpg2" ] && rm -f = %D/bin/gpg || true >=20 > You can also use test -e here and also, if there's an error I think it > should be reported to the user instead of being masked with true. >=20 > @postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg Thanks, Tijl. Please, feel free to make the changes you recommend to all = 3 gnupg ports! # Adam --=20 Adam Weinberger adamw@adamw.org https://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?95A8F085-783E-4EA7-B0F3-B47B0DCE7423>