releasing version 1.08

[code/myrepos.git] / mr

diff --git a/mr b/mr
index e89d01a288285058046a17a9ebac7c359986c131..23178a5c2bb03e3528aceae6f366fcdeb8f8eb1c 100755 (executable)
--- a/mr
+++ b/mr
@@ -546,6 +546,7 @@ my $jobs=1;
 my $trust_all=0;
 my $directory=getcwd();
 
+my $HOME_MR_CONFIG = "$ENV{HOME}/.mrconfig";
 $ENV{MR_CONFIG}=find_mrconfig();
 
 # globals :-(
@@ -626,7 +627,7 @@ sub vcs_test {
                        }
                        next;
                }
-               my $vcs=$vcs_test =~ /(.*)_test/;
+               my ($vcs)=$vcs_test =~ /(.*)_test/;
                $test="my_$vcs_test() {\n$config{$topdir}{$subdir}{$vcs_test}\n}\n".$test;
                $test.="if my_$vcs_test; then echo $vcs; fi\n";
        }
@@ -1102,14 +1103,14 @@ sub is_trusted_config {
        my $config=shift; # must be abs_pathed already
 
        # We always trust ~/.mrconfig.
-       return 1 if $config eq abs_path("$ENV{HOME}/.mrconfig");
+       return 1 if $config eq abs_path($HOME_MR_CONFIG);
 
        return 1 if $trust_all;
 
        my $trustfile=$ENV{HOME}."/.mrtrust";
 
        if (! %trusted) {
-               $trusted{"$ENV{HOME}/.mrconfig"}=1;
+               $trusted{$HOME_MR_CONFIG}=1;
                if (open (TRUST, "<", $trustfile)) {
                        while (<TRUST>) {
                                chomp;
@@ -1732,7 +1733,7 @@ sub find_mrconfig {
                }
                $dir=~s/\/[^\/]*$//;
        }
-       return "$ENV{HOME}/.mrconfig";
+       return $HOME_MR_CONFIG;
 }
 
 sub getopts {
@@ -1802,7 +1803,7 @@ sub main {
        init();
 
        startingconfig();
-       loadconfig("$ENV{HOME}/.mrconfig");
+       loadconfig($HOME_MR_CONFIG);
        loadconfig($ENV{MR_CONFIG});
        #use Data::Dumper; print Dumper(\%config);