X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=lib%2FClearcase.pm;fp=lib%2FClearcase.pm;h=a8451842fdb8d7436721bf82d5f94a858e371c05;hb=e907bf835bb61d8888f2fcd59c90bd071e841cf7;hp=81822dd47922fb9fee1ab0dfe23a34b2246b27b9;hpb=64b1fd397779f5b896e23fcca190b3e42f244145;p=clearscm.git diff --git a/lib/Clearcase.pm b/lib/Clearcase.pm index 81822dd..a845184 100644 --- a/lib/Clearcase.pm +++ b/lib/Clearcase.pm @@ -82,7 +82,7 @@ use Display; my ($clearpid, $clearin, $clearout, $oldHandler, $cleartool); -our $VIEW_DRIVE = $ENV{CLEARCASE_VIEW_DRIVE} || 'M'; +our $VIEW_DRIVE = 'M'; our $VOB_MOUNT = 'vob'; our $WIN_VOB_PREFIX = '\\'; our $SFX = $ENV{CLEARCASE_XN_SFX} ? $ENV{CLEARCASE_XN_SFX} : '@@'; @@ -118,9 +118,9 @@ BEGIN { # We can go to the registry pretty easy in Cygwin but I'm not sure how to do # that in plain old Windows. Most people either have Clearcase installed on # the C drive or commonly on the D drive on servers. So we'll look at both. - $CCHOME = 'C:\\Program Files (x86)\\ibm\\RationalSDLC\\Clearcase'; + $CCHOME = 'C:\\IBMRational\\RationalSDLC\\Clearcase'; - $CCHOME = 'D:\\Program Files (x86)\\ibm\\RationalSDLC\\Clearcase' + $CCHOME = 'D:\\IBMRational\\RationalSDLC\\Clearcase' unless -d $CCHOME; error 'Unable to figure out where Clearcase is installed', 1 @@ -579,7 +579,7 @@ Array of output lines from the cleartool command execution. # to use these Clearcase objects say in a web page where the server is often # run as a plain user who does not have cleartool in their path. unless ($cleartool) { - if ($ARCHITECTURE =~ /Win/i or $ARCHITECTURE eq 'cygwin') { + if ($ARCHITECTURE =~ /Win/ or $ARCHITECTURE eq 'cygwin') { $cleartool = 'cleartool'; } elsif (-x '/opt/rational/clearcase/bin/cleartool') { $cleartool = '/opt/rational/clearcase/bin/cleartool';