From 51b2ce63be726793260147162a4108ae3e4a73d6 Mon Sep 17 00:00:00 2001
From: tuitang00 <416322518@qq.com>
Date: Tue, 16 May 2023 08:42:03 +0000
Subject: [PATCH] obd: update for new deploy.py

---
 tools/deploy/activate_obd.sh | 10 ++++++----
 tools/deploy/obd.sh          |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/deploy/activate_obd.sh b/tools/deploy/activate_obd.sh
index c10b857ed..7ad4e133c 100644
--- a/tools/deploy/activate_obd.sh
+++ b/tools/deploy/activate_obd.sh
@@ -24,10 +24,12 @@ if [ -f $OBD_INSTALL_PRE/etc/profile.d/obd.sh ]
 then
   source $OBD_INSTALL_PRE/etc/profile.d/obd.sh 
 fi
-obd_dev=${OBD_HOME_GLOBAL:-~/.obd_dev}
-mkdir -p $obd_dev/cluster
-mkdir -p $OBD_HOME/.obd
-[ ! -d $OBD_HOME/.obd/cluster ] && ln -fs $obd_dev/cluster $OBD_HOME/.obd
+if [[ "${OB_DO_NO_GLOBAL_CLUSTER:-0}" == "0" ]]; then
+    obd_dev=${OBD_HOME_GLOBAL:-~/.obd_dev}
+    mkdir -p $obd_dev/cluster
+    mkdir -p $OBD_HOME/.obd
+    [ ! -d $OBD_HOME/.obd/cluster ] && ln -fs $obd_dev/cluster $OBD_HOME/.obd
+fi
 
 if [ -n "$BASH_VERSION" ]; then
     complete -F _obd_sh_complete_func ./obd.sh
diff --git a/tools/deploy/obd.sh b/tools/deploy/obd.sh
index 1ea40560a..c9b73451b 100755
--- a/tools/deploy/obd.sh
+++ b/tools/deploy/obd.sh
@@ -668,7 +668,7 @@ function main() {
   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)
-  [[ "$OBD_LOCK_MODE" ]] || obd env set OBD_LOCK_MODE 1
+  [[ "$OBD_LOCK_MODE" ]] || obd env set OBD_LOCK_MODE 0
   fi
   if [[  "$(grep '"OBD_DEPLOY_BASE_DIR":' $DEPLOY_PATH/.obd/.obd_environ)" == "" ]]
   then