More changes for GD

[clearscm.git] / rc / clearcase

diff --git a/rc/clearcase b/rc/clearcase
index 3317a01..1c33ad1 100644 (file)
--- a/rc/clearcase
+++ b/rc/clearcase
@@ -15,7 +15,10 @@
 #
 ################################################################################
 if [ $ARCHITECTURE = 'cygwin' ]; then
-  export CCHOME=$(cygpath -u "$(regtool get '/machine/SOFTWARE/Rational Software/RSINSTALLDIR' 2>/dev/null)"/Clearcase 2>/dev/null);
+  # The following should work but fails because they are using /c to mount
+  # the C drive and that messes things up.
+  export CCHOME=$(cygpath -u "$(regtool get '/machine/SOFTWARE/Atria/ClearCase/CurrentVersion/ProductHome' 2>/dev/null)" 2>/dev/null)
+  export CCHOME=/opt/rational/clearcase
 else 
   export CCHOME="/opt/rational/clearcase"
 fi
@@ -129,11 +132,11 @@ function lllock {
 # View related functions
 function setview {
   if [ $ARCHITECTURE = 'cygwin' ]; then
-       if [[ $1 = -* ]]; then
-         echo "The setview command with options is not supported on Windows"
-         return
-       fi
-        
+    if [[ $1 = -* ]]; then
+      echo "The setview command with options is not supported on Windows"
+      return
+    fi
+
     # Save off where we are
     back=$PWD
 
@@ -145,7 +148,7 @@ function setview {
     fi
 
     # Setup $VOBTAG_PREFIX
-    mount -f -o binary M:/$1 $LINUX_VOBTAG_PREFIX
+    mount -f -o binary $CLEARCASE_VIEW_DRIVE:/$1 $LINUX_VOBTAG_PREFIX
 
     # Start a bash shell
     bash