mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-05-04 17:15:58 +08:00
fix: Fix Bug related issues with OpenIM actions PR (#921)
* feat: add test changelog file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test changelog file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test changelog file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test changelog file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test changelog file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test changelog file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add test changelog file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> * feat: add scripts test and format Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --------- Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
This commit is contained in:
+9
-11
@@ -529,11 +529,11 @@ openim::util::find-binary-for-platform() {
|
||||
local -r lookfor="$1"
|
||||
local -r platform="$2"
|
||||
local locations=(
|
||||
"${OPENIM_ROOT}/_output/bin/${lookfor}"
|
||||
"${OPENIM_ROOT}/_output/${platform}/${lookfor}"
|
||||
"${OPENIM_ROOT}/_output/local/bin/${platform}/${lookfor}"
|
||||
"${OPENIM_ROOT}/_output/platforms/${platform}/${lookfor}"
|
||||
"${OPENIM_ROOT}/_output/platforms/bin/${platform}/${lookfor}"
|
||||
""${OPENIM_ROOT}"/_output/bin/${lookfor}"
|
||||
""${OPENIM_ROOT}"/_output/${platform}/${lookfor}"
|
||||
""${OPENIM_ROOT}"/_output/local/bin/${platform}/${lookfor}"
|
||||
""${OPENIM_ROOT}"/_output/platforms/${platform}/${lookfor}"
|
||||
""${OPENIM_ROOT}"/_output/platforms/bin/${platform}/${lookfor}"
|
||||
)
|
||||
|
||||
# List most recently-updated location.
|
||||
@@ -610,11 +610,11 @@ openim::util::gen-docs() {
|
||||
# Removes previously generated docs-- we don't want to check them in. $OPENIM_ROOT
|
||||
# must be set.
|
||||
openim::util::remove-gen-docs() {
|
||||
if [ -e "${OPENIM_ROOT}/docs/.generated_docs" ]; then
|
||||
if [ -e ""${OPENIM_ROOT}"/docs/.generated_docs" ]; then
|
||||
# remove all of the old docs; we don't want to check them in.
|
||||
while read -r file; do
|
||||
rm "${OPENIM_ROOT}/${file}" 2>/dev/null || true
|
||||
done <"${OPENIM_ROOT}/docs/.generated_docs"
|
||||
rm ""${OPENIM_ROOT}"/${file}" 2>/dev/null || true
|
||||
done <""${OPENIM_ROOT}"/docs/.generated_docs"
|
||||
# The docs/.generated_docs file lists itself, so we don't need to explicitly
|
||||
# delete it.
|
||||
fi
|
||||
@@ -1212,9 +1212,7 @@ function openim::util::get_server_ip() {
|
||||
}
|
||||
|
||||
function openim::util::onCtrlC() {
|
||||
kill -9 "${do_sth_pid}" "${progress_pid}" "${countdown_pid}"
|
||||
echo
|
||||
echo 'Ctrl+C is captured'
|
||||
echo -e "\n${t_reset}Ctrl+C Press it. It's exiting openim make init..."
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user