From 29d422b71d4b45a52c1d42995df14bae4e89612d Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Mon, 10 Jul 2023 17:49:28 +0800 Subject: [PATCH] feat: add scripts and fix Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- scripts/batch_start_all.sh | 6 +++--- scripts/build_all_service.sh | 8 ++++++-- scripts/check_all.sh | 6 +++--- scripts/enterprise/check_all.sh | 6 +++--- scripts/msg_gateway_start.sh | 6 +++--- scripts/msg_transfer_start.sh | 6 +++--- scripts/path_info.sh | 6 +++--- scripts/push_start.sh | 6 +++--- scripts/start_all.sh | 6 +++--- scripts/start_cron.sh | 6 +++--- 10 files changed, 33 insertions(+), 29 deletions(-) diff --git a/scripts/batch_start_all.sh b/scripts/batch_start_all.sh index e291819f4..45ec813c5 100755 --- a/scripts/batch_start_all.sh +++ b/scripts/batch_start_all.sh @@ -27,9 +27,9 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT -echo -e "${BACKGROUND_GREEN}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>pwd=$PWD${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" need_to_start_server_shell=( "start_rpc_service.sh" diff --git a/scripts/build_all_service.sh b/scripts/build_all_service.sh index 5aea8b1d9..ebbc02dfa 100755 --- a/scripts/build_all_service.sh +++ b/scripts/build_all_service.sh @@ -17,13 +17,17 @@ SCRIPTS_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. -cd $SCRIPTS_ROOT - #Include shell font styles and some basic information source $SCRIPTS_ROOT/style_info.sh source $SCRIPTS_ROOT/path_info.sh source $SCRIPTS_ROOT/function.sh +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" + +cd $SCRIPTS_ROOT + echo -e "" echo -e "${BACKGROUND_BLUE}===============> Building all using make build binary files ${COLOR_SUFFIX}" diff --git a/scripts/check_all.sh b/scripts/check_all.sh index db420dd21..c4f5dd490 100755 --- a/scripts/check_all.sh +++ b/scripts/check_all.sh @@ -24,9 +24,9 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT -echo -e "${BACKGROUND_GREEN}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>pwd=$PWD${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" service_port_name=( openImWsPort diff --git a/scripts/enterprise/check_all.sh b/scripts/enterprise/check_all.sh index 7b8a3c5da..973a6a962 100755 --- a/scripts/enterprise/check_all.sh +++ b/scripts/enterprise/check_all.sh @@ -24,9 +24,9 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT -echo -e "${BACKGROUND_GREEN}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>pwd=$PWD${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" service_port_name=( openImChatApiPort diff --git a/scripts/msg_gateway_start.sh b/scripts/msg_gateway_start.sh index b3b71d220..c66bd8460 100755 --- a/scripts/msg_gateway_start.sh +++ b/scripts/msg_gateway_start.sh @@ -24,9 +24,9 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT -echo -e "${BACKGROUND_GREEN}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>pwd=$PWD${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" bin_dir="$BIN_DIR" logs_dir="$OPENIM_ROOT/logs" diff --git a/scripts/msg_transfer_start.sh b/scripts/msg_transfer_start.sh index 541c82910..e61492f34 100755 --- a/scripts/msg_transfer_start.sh +++ b/scripts/msg_transfer_start.sh @@ -24,9 +24,9 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT -echo -e "${BACKGROUND_GREEN}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>pwd=$PWD${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" bin_dir="$BIN_DIR" logs_dir="$OPENIM_ROOT/logs" diff --git a/scripts/path_info.sh b/scripts/path_info.sh index ab6f2b2df..5351a43db 100755 --- a/scripts/path_info.sh +++ b/scripts/path_info.sh @@ -28,16 +28,16 @@ declare -A supported_architectures=( # Check if the architecture and version are supported if [[ -z ${supported_architectures["$version-$architecture"]} ]]; then - echo "================> Unsupported architecture: $architecture or version: $version" + echo -e "${BLUE_PREFIX}================> Unsupported architecture: $architecture or version: $version${COLOR_SUFFIX}" exit 1 fi -echo "================> Architecture: $architecture" +echo -e "${BLUE_PREFIX}================> Architecture: $architecture${COLOR_SUFFIX}" # Set the BIN_DIR based on the architecture and version BIN_DIR=${supported_architectures["$version-$architecture"]} -echo "================> BIN_DIR: $OPENIM_ROOT/$BIN_DIR" +echo -e "${BLUE_PREFIX}================> BIN_DIR: $OPENIM_ROOT/$BIN_DIR${COLOR_SUFFIX}" # Don't put the space between "=" openim_msggateway="openim-msggateway" diff --git a/scripts/push_start.sh b/scripts/push_start.sh index ea353cd56..79d877c79 100755 --- a/scripts/push_start.sh +++ b/scripts/push_start.sh @@ -24,9 +24,9 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT -echo -e "${BACKGROUND_GREEN}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>pwd=$PWD${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" bin_dir="$BIN_DIR" logs_dir="$OPENIM_ROOT/logs" diff --git a/scripts/start_all.sh b/scripts/start_all.sh index 976320dad..4e7db6e3e 100755 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -27,9 +27,9 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT -echo -e "${BACKGROUND_GREEN}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>pwd=$PWD${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" bin_dir="$BIN_DIR" logs_dir="$OPENIM_ROOT/logs" diff --git a/scripts/start_cron.sh b/scripts/start_cron.sh index bef9ca36e..79b5b9c31 100755 --- a/scripts/start_cron.sh +++ b/scripts/start_cron.sh @@ -24,9 +24,9 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT -echo -e "${BACKGROUND_GREEN}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" -echo -e "${BACKGROUND_GREEN}=======>pwd=$PWD${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" +echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" bin_dir="$BIN_DIR" logs_dir="$OPENIM_ROOT/logs"