Bugfix for fetching cpan files.

Minor style fixes. Remove extra whitespace. Use metacpan.org for url.

2 files changed, 14 insertions, 14 deletions

diff --git a/bin/metas/perl b/bin/metas/perl
index 89e63aa..2f341e5 100755
--- a/bin/metas/perl
+++ b/bin/metas/perl
@@ -12,7 +12,7 @@ my $PROG = 'perl';
 sub err
 {
 	print STDERR @_, "\n";
-	exit 2;	
+	exit 2;
 }
 
 sub matchdist
@@ -23,18 +23,20 @@ sub matchdist
 	my $var = $ENV{'PKGVAR'}
 		or err("$PROG: PKGVAR env variable is unset\n");
 
-	my $cwd = getcwd();
-	if(! -f "$var/cpandists" || -M "$var/cpandists" > 1) {
+	if(!-f "$var/cpandists" || -M "$var/cpandists" > 1) {
 		print STDERR "Refreshing local CPAN distribution list...";
+		my $cwd = getcwd();
+		chdir($var) or die "chdir: $!";
 		system('cpandists');
-		err("FAILED") unless $? == 0;
+		err("FAILED") unless($? == 0);
 		print STDERR "OK\n";
+		chdir($cwd) or die "chdir: $!";
 	}
 
 	open(DISTS, '<', "$var/cpandists") or err("$PROG: open: $!");
 	while(<DISTS>) {
 		my @f = split;
-		next unless(lc $f[0] eq lc $dist);
+		next unless(lc($f[0]) eq lc($dist));
 		close(DISTS);
 		return ($f[0], $f[2]);
 	}
@@ -65,23 +67,22 @@ sub main
 	my $pkg = shift or die "Usage: $PROG [package name]\n";
 	my $dist = $pkg;
 
-	$dist = "app-$dist" if $dist =~ s/^perl-// == 0;
-	
+	$dist = "app-$dist" if($dist =~ s/^perl-// == 0);
+
 	STDERR->autoflush(1);
 	my ($realname, $cpath) = matchdist($dist);
-	unless($realname) {
+	unless($realname){
 		print STDERR "$PROG: failed to find perl dist similar to $dist\n";
 		exit 1;
 	}
 	fetchdist($cpath);
 
-	my $srch = 'http://search.cpan.org';
 	print <<"END_META";
 url
-$srch/dist/$realname
+https://metacpan.org/release/$realname
 
 source
-$srch/CPAN/authors/id/$cpath
+http://search.cpan.org/CPAN/authors/id/$cpath
 
 END_META
 
diff --git a/bin/metas/perl.d/perl-dist b/bin/metas/perl.d/perl-dist
index 32b2414..ef08d0a 100755
--- a/bin/metas/perl.d/perl-dist
+++ b/bin/metas/perl.d/perl-dist
@@ -167,7 +167,7 @@ sub _perldepver
 sub _reqs2deps
 {
 	my ($prereqs) = @_;
-	my (@mods, %pkgdeps);	
+	my (@mods, %pkgdeps);
 
 	CPAN_DEP_LOOP:
 	while(my ($name, $ver) = each(%$prereqs)) {
@@ -195,7 +195,6 @@ sub _reqs2deps
 		$pkgdeps{$pkgname} ||= ($ver ? dist_pkgver($ver) : 0);
 	}
 
-	
 	return \%pkgdeps;
 }
 
@@ -218,7 +217,7 @@ sub prereqs
 		if($pkgdeps{$arch}) { _merge($pkgdeps{$arch}, $deps); }
 		else { $pkgdeps{$arch} = $deps; }
 	}
-	
+
 	# ArchLinux now has a separate array for dependencies that we only
 	# need for checking (aka "testing"). Older perl METAs do not
 	# have this separated. Force any test modules to be checkdepends.