diff --git a/scripts/install/common.sh b/scripts/install/common.sh index 41b0adca5..316c5a359 100755 --- a/scripts/install/common.sh +++ b/scripts/install/common.sh @@ -111,7 +111,7 @@ readonly OPENIM_ALL_SERVICE_LIBRARIES_NO_TRANSFER OPENIM_ALL_SERVICE_LIBRARIES=() -for target in "${OPENIM_SERVER_TARGETS[@]}"; do +for target in "${OPENIM_SERVER_BINARIES_NO_CMDUTILS[@]}"; do OPENIM_ALL_SERVICE_LIBRARIES+=("${OPENIM_OUTPUT_HOSTBIN}/${target}") done readonly OPENIM_ALL_SERVICE_LIBRARIES diff --git a/scripts/lib/golang.sh b/scripts/lib/golang.sh index 1e18ab53d..7b9d7e60c 100755 --- a/scripts/lib/golang.sh +++ b/scripts/lib/golang.sh @@ -87,7 +87,6 @@ openim::golang::server_targets() { openim::golang::server_targets_no_transfer() { local targets=( openim-api - openim-cmdutils openim-crontask openim-msggateway openim-push @@ -102,6 +101,33 @@ openim::golang::server_targets_no_transfer() { echo "${targets[@]}" } +openim::golang::server_targets_no_cmdutils() { + local targets=( + openim-api + openim-crontask + openim-msggateway + openim-msgtransfer + openim-push + openim-rpc-auth + openim-rpc-conversation + openim-rpc-friend + openim-rpc-group + openim-rpc-msg + openim-rpc-third + openim-rpc-user + ) + echo "${targets[@]}" +} + + +IFS=" " read -ra OPENIM_SERVER_TARGETS_NO_CMDUTILS <<< "$(openim::golang::server_targets_no_cmdutils)" +readonly OPENIM_SERVER_TARGETS_NO_CMDUTILS +readonly OPENIM_SERVER_BINARIES_NO_CMDUTILS=("${OPENIM_SERVER_TARGETS_NO_CMDUTILS[@]##*/}") + + + + + IFS=" " read -ra OPENIM_SERVER_TARGETS_NO_TRANSFER <<< "$(openim::golang::server_targets_no_transfer)" readonly OPENIM_SERVER_TARGETS_NO_TRANSFER readonly OPENIM_SERVER_BINARIES_NO_TRANSFER=("${OPENIM_SERVER_TARGETS_NO_TRANSFER[@]##*/}")