fix: directory name

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
pull/462/head
Xinwei Xiong(cubxxw-openim) 1 year ago
parent 94bc02caa2
commit b6e108774a

@ -17,7 +17,7 @@
OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
# Include necessary files # Include necessary files
source "$(dirname "${BASH_SOURCE[0]}")/../scripts/function" source "$(dirname "${BASH_SOURCE[0]}")/../scripts.sh"
# Include specific functions and variables # Include specific functions and variables
source "$(dirname "${BASH_SOURCE[0]}")/../scripts/style_info.cfg" \ source "$(dirname "${BASH_SOURCE[0]}")/../scripts/style_info.cfg" \

@ -17,12 +17,12 @@
source ./style_info.cfg source ./style_info.cfg
source ./path_info.cfg source ./path_info.cfg
source ./function.sh source ./function.sh
echo -e "\n" echo -e ""
echo -e "${BACKGROUND_BLUE}===============> Building all using make build binary files ${COLOR_SUFFIX}" echo -e "${BACKGROUND_BLUE}===============> Building all using make build binary files ${COLOR_SUFFIX}"
echo -e "\n" echo -e ""
echo -e "${BOLD_PREFIX}_____ _ _ _____ _____ _____ _____ _____ _____ _____ _____ _____ ${COLOR_SUFFIX}" echo -e "${BOLD_PREFIX}____________________________________________________________ ${COLOR_SUFFIX}"
bin_dir="$BIN_DIR" bin_dir="$BIN_DIR"
@ -39,14 +39,13 @@ if [ ! -d $sdk_db_dir ]; then
mkdir -p $sdk_db_dir mkdir -p $sdk_db_dir
fi fi
# OpenIM root path #Include shell font styles and some basic information
OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source ./style_info.cfg #Include shell font styles and some basic information
source ./path_info.cfg source $OPENIM_ROOT/scripts/style_info.cfg
source ./function.sh source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function.sh
#!/bin/bash
cd $OPENIM_ROOT cd $OPENIM_ROOT
@ -102,11 +101,11 @@ for binary in $(find _output/bin/platforms/$REPO_DIR -type f); do
fi fi
done done
echo -e " \n" echo -e " "
echo -e "${BOLD_PREFIX}=====================> Build Results <=====================${COLOR_SUFFIX}" echo -e "${BOLD_PREFIX}=====================> Build Results <=====================${COLOR_SUFFIX}"
echo -e " \n" echo -e " "
if [[ "$BUILD_SUCCESS" == true ]]; then if [[ "$BUILD_SUCCESS" == true ]]; then
echo -e "${GREEN_PREFIX}All binaries built successfully.${COLOR_SUFFIX}" echo -e "${GREEN_PREFIX}All binaries built successfully.${COLOR_SUFFIX}"
@ -117,8 +116,8 @@ else
done done
fi fi
echo -e " \n" echo -e " "
echo -e "${BOLD_PREFIX}============================================================${COLOR_SUFFIX}" echo -e "${BOLD_PREFIX}============================================================${COLOR_SUFFIX}"
echo -e " \n" echo -e " "

@ -13,10 +13,16 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
#Include shell font styles and some basic information
OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.cfg
source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function.sh
cd "$OPENIM_ROOT/scripts/"
source ./style_info.cfg
source ./enterprise/path_info.cfg
source ./enterprise/function.sh
service_port_name=( service_port_name=(
openImChatApiPort openImChatApiPort
openImAdminApiPort openImAdminApiPort

@ -15,8 +15,8 @@ service_source_root=(
../cmd/api/chat/ ../cmd/api/chat/
../cmd/api/admin/ ../cmd/api/admin/
#rpc service file #rpc service file
../cmd/rpc/admin/ ../cmd/openim-rpc/admin/
../cmd/rpc/chat/ ../cmd/openim-rpc/chat/
) )
#service filename #service filename
service_names=( service_names=(

@ -19,7 +19,7 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information #Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.cfg source $OPENIM_ROOT/scripts/style_info.cfg
source $OPENIM_ROOT/scripts/path_info.cfg source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function source $OPENIM_ROOT/scripts/function.sh
bin_dir="$OPENIM_ROOT/bin" bin_dir="$OPENIM_ROOT/bin"
logs_dir="$OPENIM_ROOT/logs" logs_dir="$OPENIM_ROOT/logs"

@ -19,7 +19,7 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information #Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.cfg source $OPENIM_ROOT/scripts/style_info.cfg
source $OPENIM_ROOT/scripts/path_info.cfg source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function source $OPENIM_ROOT/scripts/function.sh
bin_dir="$OPENIM_ROOT/bin" bin_dir="$OPENIM_ROOT/bin"
logs_dir="$OPENIM_ROOT/logs" logs_dir="$OPENIM_ROOT/logs"

@ -23,7 +23,7 @@ if [[ -z ${supported_architectures["$version-$architecture"]} ]]; then
echo "================> Unsupported architecture: $architecture or version: $version" echo "================> Unsupported architecture: $architecture or version: $version"
exit 1 exit 1
fi fi
Server Start Time
echo "================> Architecture: $architecture" echo "================> Architecture: $architecture"
# Set the BIN_DIR based on the architecture and version # Set the BIN_DIR based on the architecture and version
@ -31,32 +31,31 @@ BIN_DIR=${supported_architectures["$version-$architecture"]}
echo "================> BIN_DIR: $OPENIM_ROOT/$BIN_DIR" echo "================> BIN_DIR: $OPENIM_ROOT/$BIN_DIR"
# Don't put the space between "=" # Don't put the space between "="
openim_msggateway="openim-msggateway" openim_msggateway="openim-msggateway"
msg_gateway_binary_root= $OPENIM_ROOT/$BIN_DIR/ msg_gateway_binary_root="$OPENIM_ROOT/$BIN_DIR"
msg_gateway_source_root="../cmd/msggateway/" msg_gateway_source_root="../cmd/msggateway/"
msg_name="openim-rpc-msg" msg_name="openim-rpc-msg"
msg_binary_root=$OPENIM_ROOT/$BIN_DIR msg_binary_root="$OPENIM_ROOT/$BIN_DIR"
msg_source_root="../cmd/rpc/msg/" msg_source_root="../cmd/openim-rpc/msg/"
push_name="openim-push" push_name="openim-push"
push_binary_root=$OPENIM_ROOT/$BIN_DIR push_binary_root="$OPENIM_ROOT/$BIN_DIR"
push_source_root="../cmd/push/" push_source_root="../cmd/push/"
openim_msgtransfer="openim-rpc-msg_transfer" openim_msgtransfer="openim-rpc-msg_transfer"
msg_transfer_binary_root=$OPENIM_ROOT/$BIN_DIR msg_transfer_binary_root="$OPENIM_ROOT/$BIN_DIR"
msg_transfer_source_root="../cmd/msgtransfer/" msg_transfer_source_root="../cmd/msgtransfer/"
msg_transfer_service_num=4 msg_transfer_service_num=4
cron_task_name="openim-crontask" cron_task_name="openim-crontask"
cron_task_binary_root=$OPENIM_ROOT/$BIN_DIR cron_task_binary_root="$OPENIM_ROOT/$BIN_DIR"
cron_task_source_root="../cmd/crontask/" cron_task_source_root="../cmd/crontask/"
cmd_utils_name="openim_cmd_utils" cmd_utils_name="openim_cmd_utils"
cmd_utils_binary_root=$OPENIM_ROOT/$BIN_DIR cmd_utils_binary_root="$OPENIM_ROOT/$BIN_DIR"
cmd_utils_source_root="../cmd/cmduitls/" cmd_utils_source_root="../cmd/cmduitls/"
# Global configuration file default dir # Global configuration file default dir
@ -67,13 +66,13 @@ service_source_root=(
# api service file # api service file
"../cmd/api/" "../cmd/api/"
# rpc service file # rpc service file
"../cmd/rpc/user/" "../cmd/openim-rpc/openim-rpc-user/"
"../cmd/rpc/friend/" "../cmd/openim-rpc/openim-rpc-friend/"
"../cmd/rpc/group/" "../cmd/openim-rpc/openim-rpc-group/"
"../cmd/rpc/auth/" "../cmd/openim-rpc/openim-rpc-auth/"
"../cmd/rpc/conversation/" "../cmd/openim-rpc/openim-rpc-conversation/"
"../cmd/rpc/third/" "../cmd/openim-rpc/openim-rpc-third/"
"../cmd/crontask" "../cmd/openim-crontask"
"${msg_gateway_source_root}" "${msg_gateway_source_root}"
"${msg_transfer_source_root}" "${msg_transfer_source_root}"
"${msg_source_root}" "${msg_source_root}"

@ -19,7 +19,7 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information #Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.cfg source $OPENIM_ROOT/scripts/style_info.cfg
source $OPENIM_ROOT/scripts/path_info.cfg source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function source $OPENIM_ROOT/scripts/function.sh
bin_dir="$OPENIM_ROOT/bin" bin_dir="$OPENIM_ROOT/bin"
logs_dir="$OPENIM_ROOT/logs" logs_dir="$OPENIM_ROOT/logs"

@ -22,7 +22,7 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information #Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.cfg source $OPENIM_ROOT/scripts/style_info.cfg
source $OPENIM_ROOT/scripts/path_info.cfg source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function source $OPENIM_ROOT/scripts/function.sh
bin_dir="$OPENIM_ROOT/bin" bin_dir="$OPENIM_ROOT/bin"
logs_dir="$OPENIM_ROOT/logs" logs_dir="$OPENIM_ROOT/logs"

@ -19,7 +19,7 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information #Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.cfg source $OPENIM_ROOT/scripts/style_info.cfg
source $OPENIM_ROOT/scripts/path_info.cfg source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function source $OPENIM_ROOT/scripts/function.sh
bin_dir="$OPENIM_ROOT/bin" bin_dir="$OPENIM_ROOT/bin"
logs_dir="$OPENIM_ROOT/logs" logs_dir="$OPENIM_ROOT/logs"

@ -18,7 +18,7 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information #Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.cfg source $OPENIM_ROOT/scripts/style_info.cfg
source $OPENIM_ROOT/scripts/path_info.cfg source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function source $OPENIM_ROOT/scripts/function.sh
bin_dir="$BIN_DIR" bin_dir="$BIN_DIR"
logs_dir="$OPENIM_ROOT/logs" logs_dir="$OPENIM_ROOT/logs"

@ -19,7 +19,7 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
#Include shell font styles and some basic information #Include shell font styles and some basic information
source $OPENIM_ROOT/scripts/style_info.cfg source $OPENIM_ROOT/scripts/style_info.cfg
source $OPENIM_ROOT/scripts/path_info.cfg source $OPENIM_ROOT/scripts/path_info.cfg
source $OPENIM_ROOT/scripts/function source $OPENIM_ROOT/scripts/function.sh
bin_dir="$OPENIM_ROOT/bin" bin_dir="$OPENIM_ROOT/bin"
logs_dir="$OPENIM_ROOT/logs" logs_dir="$OPENIM_ROOT/logs"

Loading…
Cancel
Save