X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/85ecfb40a19334d7ea53de8b982915eff3cae07d..fca9fb631455f518ae828b36c0fe355a3c8c0665:/mr?ds=sidebyside

diff --git a/mr b/mr
index b5d5c11..0bf6655 100755
--- a/mr
+++ b/mr
@@ -791,7 +791,9 @@ sub repodir {
 	my $repo=shift;
 	my $topdir=$repo->{topdir};
 	my $subdir=$repo->{subdir};
-	return abs_path(($subdir =~/^\//) ? $subdir : $topdir.$subdir);
+	my $ret=($subdir =~/^\//) ? $subdir : $topdir.$subdir;
+	$ret=~s/\/\.$//;
+	return $ret;
 }
 
 # figure out which repos to act on
@@ -1357,7 +1359,7 @@ sub bootstrap {
 	eval q{use File::Temp};
 	die $@ if $@;
 	my $tmpconfig=File::Temp->new();
-	my @curlargs = ("curl", "-A", "mr", "-s", $url, "-o", $tmpconfig);
+	my @curlargs = ("curl", "-A", "mr", "-L", "-s", $url, "-o", $tmpconfig);
 	push(@curlargs, "-k") if $insecure;
 	my $curlstatus = system(@curlargs);
 	die "mr bootstrap: invalid SSL certificate for $url (consider -k)\n" if $curlstatus >> 8 == 60;