Index: vectorcast/setup_env.sh
===================================================================
diff -u -r1760616331f8dbf20f80bd9ec1cfaba01134b8f7 -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359
--- vectorcast/setup_env.sh	(.../setup_env.sh)	(revision 1760616331f8dbf20f80bd9ec1cfaba01134b8f7)
+++ vectorcast/setup_env.sh	(.../setup_env.sh)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
@@ -5,13 +5,27 @@
 # *** Insert any custom environment variables needed ***
 
 # *******************************************************
+doesDialityDirExist=false
 
+# Check if this script is called from a Diality machine by checking the location that VectorCAST has been installed
+if [[ -d /opt/VectorCASTSP3 ]]; then
+   doesDialityDirExist=true 
+fi
+
 # VECTORCAST_DIR - Environment variable pointing to the base directory for VectorCAST
-export VECTORCAST_DIR=~/vcast
+if [ "$doesDialityDirExist" == false ]; then
+    export VECTORCAST_DIR=/usr/local/vcast/
+else
+   export VECTORCAST_DIR=~/vcast
+fi
 
 # VECTOR_LICENSE_FILE - Environment variable pointing to the license file
-#export VECTOR_LICENSE_FILE=27000@dvm-util01
-export VECTOR_LICENSE_FILE=27000@192.168.10.110
+if [ "$doesDialityDirExist" == false ]; then
+    export VECTOR_LICENSE_FILE=/usr/local/flexlm/licenses/license.dat
+else
+    export VECTOR_LICENSE_FILE=27000@dvm-util01
+fi
+
 # VCAST_COMPILER_DIR - Environment variable pointing to the base directory of compiler installation
 export VCAST_COMPILER_DIR=/usr/bin