From f94f54f0cd90ab9d387e0cf430ba7bc94d4b35cd Mon Sep 17 00:00:00 2001
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sun, 19 Apr 2020 00:36:04 +0000
Subject: bump_revision.pl: minor usability improvements

- use env -S to split the shebang line (RhToad@#bsdports)
- launder -p PORTSDIR argument and chdir to it so it doesn't matter
  which cwd bump_revision.pl is executed from
- if INDEX not found, hint the user that also his -p option might be off,
  because the -i INDEX option defaults to a file relative to -p PORTSDIR.
---
 Tools/scripts/bump_revision.pl | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'Tools')

diff --git a/Tools/scripts/bump_revision.pl b/Tools/scripts/bump_revision.pl
index fc3826bb07ab..736c86848731 100755
--- a/Tools/scripts/bump_revision.pl
+++ b/Tools/scripts/bump_revision.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -wT
+#!/usr/bin/env -S perl -wT
 
 # $FreeBSD$
 
@@ -7,15 +7,13 @@
 # set of ports, for instance, when in the latter set one of the ports bumped the
 # .so library version.
 #
-# It is best executed with the working directory set to the base of a
-# ports tree, such as /usr/ports.
-#
 # The shebang line above includes -T (taint) to be more distrustful 
 # about the environment, for security reasons, and is considered
 # good Perl practice.
 #
-# You can use either the -l (shaLlow, avoid grandparent dependencies,
-# slower) or -g option (include grandparent dependencies) option.
+# You can use either the
+# -l (shaLlow, avoid grandparent dependencies, slower) or
+# -g option (include grandparent dependencies) option.
 #
 # MAINTAINER=	mandree@FreeBSD.org
 #
@@ -126,7 +124,8 @@ my ($portsdir, $INDEX);
     $INDEX = $opt_i if ($opt_i);
     if (!-f $INDEX) { $INDEX = "$portsdir/INDEX"; }
 
-    die "$INDEX doesn't seem to exist. Please check the value supplied with -i, or use -i /path/to/INDEX." unless(-f $INDEX);
+    die "$INDEX doesn't seem to exist. Please check the value supplied with -i,\n" .
+	    "or use -i /path/to/INDEX, or check your -p PORTSDIR." unless(-f $INDEX);
 }
 usage() unless(@ARGV);
 
@@ -139,6 +138,16 @@ if (-d "$TMPDIR/.svn" and not $opt_n and not $opt_c) {
     die "$TMPDIR/.svn exists, cowardly refusing to proceed.\n";
 }
 
+
+# must launder $portsdir (from command line => tainted) first
+if ($portsdir =~ /^([-\@\w.\/]+)$/) {
+    $portsdir = $1; }
+else {
+    die "Portsdir \"$portsdir\" contains unsafe characters. Aborting";
+}
+
+chdir "$portsdir" or die "cannot cd to $portsdir: $!\nAborting";
+
 #
 # Read the index, save some interesting keys
 #
-- 
cgit v1.2.3