hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

obd: update for new deploy.py

Browse Source
This commit is contained in:
tuitang00 2023-05-16 08:42:03 +00:00 committed by ob-robot
parent 7a4291a73c
commit 51b2ce63be
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/deploy/activate_obd.sh
View File

@ -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

2
tools/deploy/obd.sh
View File

@ -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