Stopgap bugfix to avoid the case where a user invokes -t and ends up with

a work/ dir in the repository placed there by addport without permission.
Also restore the rcsids from the predecessors of this script by removing
their $'s.

If I had more time, I'd just revamp parts of this script.

Submitted by:	greid
Apologies to:	greid && cvs@
This commit is contained in:
Will Andrews 2001-05-01 13:54:22 +00:00
parent a2d9fdfe3e
commit ab9d25dedb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=42131

View File

@ -30,8 +30,8 @@
# Original shell script & idea: Will Andrews <will@FreeBSD.org> # Original shell script & idea: Will Andrews <will@FreeBSD.org>
# Original conversion to Perl : Michael Haro <mharo@FreeBSD.org> # Original conversion to Perl : Michael Haro <mharo@FreeBSD.org>
# #
# $Id: addport,v 1.2 2000/04/02 06:21:13 will Exp $ (original shell script) # Id: addport,v 1.2 2000/04/02 06:21:13 will Exp (original shell script)
# $Id: addport,v 1.5 2000/04/22 22:19:43 mharo Exp $ (perl conversion) # Id: addport,v 1.5 2000/04/22 22:19:43 mharo Exp (perl conversion)
# $FreeBSD$ # $FreeBSD$
# #
# MAINTAINER= will@FreeBSD.org # MAINTAINER= will@FreeBSD.org
@ -129,6 +129,7 @@ if ($addlchk && -f $portlint) {
if ($more_testing) { if ($more_testing) {
push(@commands, "$make $passenv distclean"); push(@commands, "$make $passenv distclean");
push(@commands, "$make $passenv build"); push(@commands, "$make $passenv build");
push(@commands, "$make $passenv distclean");
} }
if (!$nomkdir) { if (!$nomkdir) {
chdir $tmpdir; chdir $tmpdir;
@ -377,7 +378,7 @@ sub query {
} }
sub usage { sub usage {
#addport,v \$Revision: 1.5 $ #addport,v \$Revision: 1.21 $
print <<EOF; print <<EOF;
authors: <will\@FreeBSD.org>, <mharo\@FreeBSD.org> authors: <will\@FreeBSD.org>, <mharo\@FreeBSD.org>