添加对切换ob do中obd 关于activate-obd.sh obd.sh的修改 更新obd版本支持mysqltest测试描述

tools/deploy/activate_obd.sh

@@ -4,8 +4,12 @@ export DEPLOY_PATH=$DIR/tools/deploy
 DEP_PATH=$DIR/deps/3rd
 export OBD_BIN=${_OBD_BIN:-$DEP_PATH/usr/bin/obd}
 alias obd="${OBD_BIN}"
-export OBD_HOME=$DIR/tools/deploy
-export OBD_INSTALL_PRE=$DEP_PATH
+export OBD_HOME=${_OBD_HOME:-$DIR/tools/deploy}
+export OBD_INSTALL_PRE=${_OBD_INSTALL_PRE:-$DEP_PATH}
+
+if [ ${_OBD_PROFILE} ]; then
+    source ${_OBD_PROFILE}
+fi
 
 if [ -f $OBD_INSTALL_PRE/etc/profile.d/obd.sh ] 
 then

tools/deploy/obd.sh

@@ -32,8 +32,6 @@ function variables_parpare {
   OBCLIENT_BIN=$DEP_PATH/u01/obclient/bin/obclient
   MYSQLTEST_BIN=$DEP_PATH/u01/obclient/bin/mysqltest
   
-  export OBD_HOME=$DEPLOY_PATH
-  export OBD_INSTALL_PRE=$DEP_PATH
   DEFAULT_DEPLOY_NAME_FILE=$OBD_HOME/.obd/.default_deploy
 }
 
@@ -545,7 +543,7 @@ function main() {
       * ) extra_args="$extra_args $1"; [[ "$1" == "--help" || "$1" == "-h" ]] && HELP="1" ; shift ;;
     esac
   done
-  if [[ ! -f $DEPLOY_PATH/.obd/.obd_environ || "$(grep '"OBD_DEV_MODE": "1"' $DEPLOY_PATH/.obd/.obd_environ)" == "" ]]
+  if [[ ! -f $OBD_HOME/.obd/.obd_environ || "$(grep '"OBD_DEV_MODE": "1"' $OBD_HOME/.obd/.obd_environ)" == "" ]]
   then
   obd devmode enable || (echo "Exec obd cmd failed. If your branch is based on 3.1_opensource_release, please go to the deps/3rd directory and execute 'bash dep_create.sh all' to install obd." && exit 1)
   fi