pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/lintpkgsrc/files lintpkgsrc: cleanup: remove ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3ea89aec33e
branches:  trunk
changeset: 382507:d3ea89aec33e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jul 30 06:56:40 2022 +0000

description:
lintpkgsrc: cleanup: remove redundant curly braces around variable names

diffstat:

 pkgtools/lintpkgsrc/files/lintpkgsrc.pl |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r f3e51b806b67 -r d3ea89aec33e pkgtools/lintpkgsrc/files/lintpkgsrc.pl
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Sat Jul 30 06:49:04 2022 +0000
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Sat Jul 30 06:56:40 2022 +0000
@@ -1,6 +1,6 @@
 #!@PERL5@
 
-# $NetBSD: lintpkgsrc.pl,v 1.25 2022/07/30 06:25:51 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.26 2022/07/30 06:56:40 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -45,7 +45,7 @@
 sub parse_makefile_pkgsrc($);
 
 $ENV{PATH} .=
-    ":/bin:/usr/bin:/sbin:/usr/sbin:${conf_prefix}/sbin:${conf_prefix}/bin";
+    ":/bin:/usr/bin:/sbin:/usr/sbin:$conf_prefix/sbin:$conf_prefix/bin";
 
 if (
     !getopts('BDE:I:K:LM:OP:RSVdg:himopruyz', \%opt)
@@ -344,7 +344,7 @@
                                print "\n";
                        }
 
-                       print "\nRunning '${conf_make} fetch-list | sh' for each package:\n";
+                       print "\nRunning '$conf_make fetch-list | sh' for each package:\n";
                        foreach my $pkgver (@update) {
                                my ($pkgdir);
 
@@ -355,7 +355,7 @@
 
                                print "$pkgsrcdir/$pkgdir\n";
                                safe_chdir("$pkgsrcdir/$pkgdir");
-                               system("${conf_make} fetch-list | sh");
+                               system("$conf_make fetch-list | sh");
                        }
                }
        }
@@ -571,8 +571,8 @@
                foreach my $var (keys %{$vars}) {
                        $default_vars->{$var} = $vars->{$var};
                }
-       } elsif (-f ${conf_sysconfdir} . '/mk.conf' &&
-           ($vars = parse_makefile_vars(${conf_sysconfdir} . '/mk.conf'))) {
+       } elsif (-f "$conf_sysconfdir/mk.conf" &&
+           ($vars = parse_makefile_vars("$conf_sysconfdir/mk.conf"))) {
                foreach my $var (keys %{$vars}) {
                        $default_vars->{$var} = $vars->{$var};
                }
@@ -902,7 +902,7 @@
                my ($pkgsrcdir) = ($file =~ m:(/.*)/:);
                debug("Running '$conf_make' in '$pkgsrcdir'\n");
                my $pid = open3(\*WTR, \*RDR, \*ERR,
-                   "cd $pkgsrcdir || exit 1; ${conf_make} show-vars VARNAMES=PKGNAME");
+                   "cd $pkgsrcdir || exit 1; $conf_make show-vars VARNAMES=PKGNAME");
                if (!$pid) {
                        warn "$file: Unable to run make: $!";
                } else {



Home | Main Index | Thread Index | Old Index