From e13f7ebfe3bd5c4c50c22537b9807b2a924214d2 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Thu, 10 Aug 2023 22:24:25 +0800 Subject: [PATCH] feat: add git cherry Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- scripts/install/environment.sh | 6 +++--- scripts/install/msg_transfer_start.sh | 4 ---- scripts/install/push_start.sh | 4 ---- scripts/lib/init.sh | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh index 6dfbb26c5..e72315ed9 100755 --- a/scripts/install/environment.sh +++ b/scripts/install/environment.sh @@ -28,9 +28,9 @@ readonly USER=${USER:-'root'} # Setting a username # 设置统一的密码,方便记忆 readonly PASSWORD=${PASSWORD:-'openIM123'} # Setting a password -# Linux系统 going 用户 -readonly LINUX_USERNAME=${LINUX_USERNAME:-going} -# Linux root & going 用户密码 +# Linux系统 openim 用户 +readonly LINUX_USERNAME=${LINUX_USERNAME:-openim} +# Linux root & openim 用户密码 readonly LINUX_PASSWORD=${LINUX_PASSWORD:-${PASSWORD}} # 设置安装目录 diff --git a/scripts/install/msg_transfer_start.sh b/scripts/install/msg_transfer_start.sh index b54770466..250378649 100755 --- a/scripts/install/msg_transfer_start.sh +++ b/scripts/install/msg_transfer_start.sh @@ -21,10 +21,6 @@ OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source $SCRIPTS_ROOT/lib/init.sh source $SCRIPTS_ROOT/path_info.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}" - bin_dir="$BIN_DIR" logs_dir="$OPENIM_ROOT/logs" diff --git a/scripts/install/push_start.sh b/scripts/install/push_start.sh index e3cb45f07..0a00b91e8 100755 --- a/scripts/install/push_start.sh +++ b/scripts/install/push_start.sh @@ -25,10 +25,6 @@ source $SCRIPTS_ROOT/path_info.sh cd $SCRIPTS_ROOT -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/lib/init.sh b/scripts/lib/init.sh index 21f54a642..4f7f76bb2 100755 --- a/scripts/lib/init.sh +++ b/scripts/lib/init.sh @@ -75,7 +75,6 @@ readonly OPENIM_SUPPORTED_SERVER_PLATFORMS=( ) # If we update this we should also update the set of platforms whose standard -# library is precompiled for in build/image/cross/Dockerfile readonly OPENIM_SUPPORTED_CLIENT_PLATFORMS=( linux/amd64 linux/arm64 @@ -83,6 +82,7 @@ readonly OPENIM_SUPPORTED_CLIENT_PLATFORMS=( # The set of server targets that we are only building for Linux # If you update this list, please also update build/BUILD. +# TODO: Label openim::golang::server_targets() { local targets=( openim-api