mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

Tools/scripts/bump_revision.pl: rename options to avoid astonishment.

Browse Source 
-n was more or less some "force" option, rename to -f
-c was a dry-run option that's often called -n, rename accordingly.
This commit is contained in:
Matthias Andree 2020-05-08 01:09:15 +00:00
parent 1e16ede4da
commit db9d6d4735
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=534313
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/scripts/bump_revision.pl
View File

@ -25,7 +25,7 @@ use Cwd;
use Data::Dumper; use Data::Dumper;
use File::Basename; use File::Basename;
use vars qw/$opt_c $opt_n $opt_i $opt_u $opt_l $opt_g $opt_p/; use vars qw/$opt_n $opt_f $opt_i $opt_u $opt_l $opt_g $opt_p/;
# launder environment # launder environment
delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
@ -38,8 +38,8 @@ Usage: $0 [options] [<category>/]<portname>
Options: Options:
-l - shaLlow, only bump ports with direct dependencies. -l - shaLlow, only bump ports with direct dependencies.
-g - Grandchildren, also bump for indirect dependencies (default). -g - Grandchildren, also bump for indirect dependencies (default).
-c - Check only (dry-run), do not change Makefiles. -n - Check only (dry-run), do not change Makefiles.
-n - No tmpdir, just use the directory where INDEX resides. -f - No tmpdir, just use the directory where INDEX resides.
-i <filename> - Use this for INDEX name. Defaults to \${PORTSDIR}/INDEX-n, -i <filename> - Use this for INDEX name. Defaults to \${PORTSDIR}/INDEX-n,
where n is the major version of the OS, or \${PORTSDIR}/INDEX if missing. where n is the major version of the OS, or \${PORTSDIR}/INDEX if missing.
-p <dirname> - Set portsdir, if different from /usr/ports. -p <dirname> - Set portsdir, if different from /usr/ports.
@ -134,7 +134,7 @@ my $TMPDIR = File::Basename::dirname($INDEX);
# #
# Sanity checking # Sanity checking
# #
if (-d "$TMPDIR/.svn" and not $opt_n and not $opt_c) { if (-d "$TMPDIR/.svn" and not $opt_f and not $opt_n) {
die "$TMPDIR/.svn exists, cowardly refusing to proceed.\n"; die "$TMPDIR/.svn exists, cowardly refusing to proceed.\n";
} }
@ -258,7 +258,7 @@ my $ports = join(" ", keys %DEPPORTS);
# Create a temp directory and cvs checkout the ports # Create a temp directory and cvs checkout the ports
# (don't do error checking, too complicated right now) # (don't do error checking, too complicated right now)
# #
unless ($opt_n or $opt_c) { unless ($opt_f or $opt_n) {
$TMPDIR = ".bump_revsion_pl_tmpdir.$$"; $TMPDIR = ".bump_revsion_pl_tmpdir.$$";
print "svn checkout into $TMPDIR...\n"; print "svn checkout into $TMPDIR...\n";
mkdir($TMPDIR, 0755); mkdir($TMPDIR, 0755);
@ -275,7 +275,7 @@ unless ($opt_n or $opt_c) {
print "Updating Makefiles\n"; print "Updating Makefiles\n";
foreach my $p (sort keys(%DEPPORTS)) { foreach my $p (sort keys(%DEPPORTS)) {
print "- Updating Makefile of $p\n"; print "- Updating Makefile of $p\n";
next if $opt_c; next if $opt_n;
bumpMakefile "$p"; bumpMakefile "$p";
} }
} }
@ -283,7 +283,7 @@ unless ($opt_n or $opt_c) {
# #
# Commit the changes. Not automated. # Commit the changes. Not automated.
# #
unless ($opt_c) { unless ($opt_n) {
print <<EOF; print <<EOF;
All PORTREVISIONs have been updated. You are nearly done, only one All PORTREVISIONs have been updated. You are nearly done, only one
thing remains: Committing to the ports tree. This program is not thing remains: Committing to the ports tree. This program is not