Merge remote-tracking branch 'origin/3.6.1-code-conventions' into 3.6.1-code-conventions

This commit is contained in:
Gordon 2024-04-02 16:57:31 +08:00
commit 747823d9c1
2 changed files with 13 additions and 4 deletions

View File

@ -254,21 +254,30 @@ function openim::log::test_log() {
# openim::log::test_log # openim::log::test_log
function openim::log::print_blue() {
function openim::log::print_blue_two_line() {
local current_time=$(date "+%Y-%m-%d %H:%M:%S %Z") local current_time=$(date "+%Y-%m-%d %H:%M:%S %Z")
echo -e "[$current_time]" echo -e "[$current_time]"
echo -e "\033[0;34m$1\033[0m" echo -e "\033[0;34m$1\033[0m"
} }
function openim::log::print_blue() {
local current_time=$(date "+%Y-%m-%d %H:%M:%S %Z")
echo -e "[$current_time] \033[0;34m$1\033[0m"
}
function openim::log::print_red() { function openim::log::print_red() {
local current_time=$(date "+%Y-%m-%d %H:%M:%S %Z") local current_time=$(date "+%Y-%m-%d %H:%M:%S %Z")
echo -e "[$current_time]" echo -e "[$current_time] \033[0;31m$1\033[0m"
echo -e "\033[0;31m$1\033[0m"
} }
openim::log::colorless() { openim::log::colorless() {
local V="${V:-0}" local V="${V:-0}"
if [[ ${OPENIM_VERBOSE} < ${V} ]]; then if [[ ${OPENIM_VERBOSE} < ${V} ]]; then

View File

@ -27,7 +27,7 @@ fi
# Call the main function # Call the main function
result=$(start_binaries) result=$(start_binaries)
openim::log::print_blue "$result" openim::log::print_blue_two_line "$result"
$OPENIM_SCRIPTS/check.sh $OPENIM_SCRIPTS/check.sh