From 77d8fa0f81863c27f08a3962a0badd4726c91929 Mon Sep 17 00:00:00 2001 From: Kedi Yang <942667980@qq.com> Date: Tue, 14 Nov 2023 17:29:59 +0800 Subject: [PATCH] set build path of ob in copy.sh in alphabetical order --- tools/deploy/copy.sh | 17 +---------------- tools/deploy/obd.sh | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/tools/deploy/copy.sh b/tools/deploy/copy.sh index 39a7f44ce6..c7e493f8f6 100755 --- a/tools/deploy/copy.sh +++ b/tools/deploy/copy.sh @@ -1,24 +1,9 @@ #!/bin/bash -x SOURCE_DIR=$(readlink -f "$(dirname ${BASH_SOURCE[0]})/../..") -BUILD_TYPE_ORDER="debug debug_asan debug_no_unity release release_asan release_coverage release_no_unity - errsim errsim_asan errsim_debug errsim_sanity dissearray rpm perf sanity coverage - enable_latch_diagnose enable_memory_diagnosis enable_obj_leak_check enable_smart_var_check - trans_module_test" if [ $# -lt 1 ] then - ALL_BUILD_DIRS=$(find $SOURCE_DIR -maxdepth 1 -name 'build_*' -type d | grep -v 'build_ccls' | sort) - for TYPE in ${BUILD_TYPE_ORDER[@]} - do - for BUILD_DIR in ${ALL_BUILD_DIRS[@]} - do - if [[ "build_$TYPE" == "$(basename $BUILD_DIR)" ]] - then - break 2 - fi - done - done - [[ "$BUILD_DIR" == "" ]] && BUILD_DIR=${ALL_BUILD_DIRS[0]} + BUILD_DIR=$(find $SOURCE_DIR -maxdepth 1 -name 'build_*' -type d | grep -v 'build_ccls' | sort | head -1) if [[ "$BUILD_DIR" == "" ]] then echo "Please specify the build directory of oceanbase." diff --git a/tools/deploy/obd.sh b/tools/deploy/obd.sh index 585d8dba74..937a629578 100755 --- a/tools/deploy/obd.sh +++ b/tools/deploy/obd.sh @@ -593,7 +593,7 @@ Options: -n DEPLOY_NAME, --deploy-name DEPLOY_NAME The name of the deployment. -v VERBOSE Activate verbose output. --b BUILD_PATH, --build-path BUILD_PATH The build path of oceanbase. +-b BUILD_PATH, --build-path BUILD_PATH The build path of oceanbase. If not specified, it will be chosen in alphabetical order. -p DATA_PATH, --data-path DATA_PATH The data path for server deployment, it can be changed in the yaml file. --ip IPADDRESS The ipaddress for server deployment, it can be changed in the yaml file. --port PORT_BEGIN The port starting point. All the ports can be changed in the yaml file.