diff --git a/script/bin/auto.sh b/script/bin/auto.sh index 0397a85c3d..0db680e9ac 100644 --- a/script/bin/auto.sh +++ b/script/bin/auto.sh @@ -140,7 +140,6 @@ function wait_start_process() { for code in "${success_status_codes[@]}"; do if [ "$health_status" == "$code" ]; then echo -ne "\r[==================================================] 100%\n" - echo -e "${GREEN}Application started completed.${RESET}" return 0 fi done @@ -149,11 +148,11 @@ function wait_start_process() { local filled_length=$((progress * bar_length / 100)) local empty_length=$((bar_length - filled_length)) local bar=$(printf '>%.0s' $(seq 1 $filled_length))$(printf ' %.0s' $(seq 1 $empty_length)) - echo -ne "\r[${bar}] ${progress}% (time consuming: ${formatted_time})" + local processing_inline="\r[${bar}] ${progress}% (time consuming: ${formatted_time})" + echo -ne "${processing_inline}" sleep $delay done - echo -ne "\r[==================================================] 100% (time consuming: ${formatted_time})\n" - echo -e "${RED}Application start failed. Please check the log for details.${RESET}" + echo -ne "${processing_inline}\n" return 1 } @@ -218,7 +217,10 @@ start() { nohup java ${PARAMS_OPT} ${JVM_OPTS} ${OOM_OPT} ${GC_OPT} -Xverify:none -cp "${CLASS_PATH}" org.dinky.Dinky ${JAR_PARAMS_OPT} > ${DINKY_LOG_PATH}/dinky-start.log 2>&1 & PID=$! echo "${PID}" >"${PID_PATH}"/${PID_FILE} - wait_start_process + if ! wait_start_process; then + echo -e "${RED}Application start failed. Please check the log for details. you can execute tail -fn1000 ${DINKY_LOG_PATH}/dinky-start.log to watch the log ${RESET}" + exit 1 + fi echo -e "${GREEN}........................................Start Dinky Successfully........................................${RESET}" echo -e "${GREEN}current log path : ${DINKY_LOG_PATH}/dinky-start.log , you can execute tail -fn1000 ${DINKY_LOG_PATH}/dinky-start.log to watch the log${RESET}" else @@ -243,7 +245,10 @@ startWithJmx() { if [ -z "$pid" ]; then nohup java ${PARAMS_OPT} ${JVM_OPTS} ${OOM_OPT} ${GC_OPT} -Xverify:none "${JMX}" -cp "${CLASS_PATH}" org.dinky.Dinky ${JAR_PARAMS_OPT} > ${DINKY_LOG_PATH}/dinky-start.log 2>&1 & PID=$! - wait_start_process + if ! wait_start_process; then + echo -e "${RED}Application start failed. Please check the log for details. you can execute tail -fn1000 ${DINKY_LOG_PATH}/dinky-start.log to watch the log ${RESET}" + exit 1 + fi echo -e "$GREEN........................................Start Dinky with Jmx Successfully........................................$RESET" updatePid diff --git a/script/bin/init_flink_dependences.sh b/script/bin/init_flink_dependences.sh index b17be3aff0..a19510afa7 100644 --- a/script/bin/init_flink_dependences.sh +++ b/script/bin/init_flink_dependences.sh @@ -28,27 +28,38 @@ if [ -f "${FLINK_STORE_DIR}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.t fi fi -try_tsinghua_mirror() { +try_mirrors_download_file() { local tsinghua_url="https://mirrors.tuna.tsinghua.edu.cn/apache/flink/flink-${CURRENT_FLINK_FULL_VERSION}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz" + local aliyun_url="https://mirrors.aliyun.com/apache/flink/flink-${CURRENT_FLINK_FULL_VERSION}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz" local apache_url="https://archive.apache.org/dist/flink/flink-${CURRENT_FLINK_FULL_VERSION}/flink-${CURRENT_FLINK_FULL_VERSION}-bin-scala_2.12.tgz" - echo -e "${GREEN}Start downloading the Flink-${FLINK_VERSION_SCAN} installation package... Store it in the ${FLINK_STORE_DIR} directory${RESET}" - if download_file "$tsinghua_url" "${FLINK_STORE_DIR}"; then - echo -e "${BLUE}The address of the currently downloaded Flink installation package is：${tsinghua_url}${RESET}" + + exec_tsinghua_result=$(download_file "$tsinghua_url" "${FLINK_STORE_DIR}") + if [ ! "$exec_tsinghua_result" ]; then + echo -e "${BLUE}The tsinghua address of the currently downloaded Flink installation package is：${tsinghua_url}${RESET}" return 0 else - echo -e "${YELLOW}File not found in Tsinghua University mirror, try downloading from Apache official source...${RESET}" - if download_file "$apache_url" "${FLINK_STORE_DIR}"; then - echo -e "${BLUE}The address of the currently downloaded Flink installation package is：${apache_url}${RESET}" + echo -e "${YELLOW}Failed to download from Tsinghua mirror, try downloading from Aliyun mirror...${RESET}" + exec_aliyun_result=$(download_file "$aliyun_url" "${FLINK_STORE_DIR}") + if [ "$exec_aliyun_result" ]; then + echo -e "${BLUE}The aliyun address of the currently downloaded Flink installation package is：${aliyun_url}${RESET}" return 0 else - echo -e "${RED}Downloading from Apache official source also failed, please check the network or download manually。${RESET}" - return 1 + echo -e "${YELLOW}Failed to download from Aliyun mirror too, try downloading from Apache official source...${RESET}" + + exec_apache_result=$(download_file "$apache_url" "${FLINK_STORE_DIR}") + if [ "$exec_apache_result" ]; then + echo -e "${RED}Downloading from Apache official source also failed, please check the network or download manually。${RESET}" + return 1 + else + echo -e "${BLUE}The apache address of the currently downloaded Flink installation package is：${apache_url}${RESET}" + return 0 + fi fi fi } -if ! try_tsinghua_mirror; then +if ! try_mirrors_download_file; then exit 0 fi diff --git a/script/bin/init_jdbc_driver.sh b/script/bin/init_jdbc_driver.sh index ca9fd9c952..6521a7e1c7 100644 --- a/script/bin/init_jdbc_driver.sh +++ b/script/bin/init_jdbc_driver.sh @@ -3,8 +3,10 @@ DINKY_LIB_DIR=$1 echo -e "${GREEN}Start downloading the mysql driver package...${RESET}" -if [ -f "${DINKY_LIB_DIR}/mysql-connector-j-8.4.0.jar" ]; then - echo -e "${YELLOW}mysql The driver package already exists, no need to download it again. Skip this step。${RESET}" +# 执行查看文件是否存在 +exec_result=$(ll "${DINKY_LIB_DIR}"/mysql-connector-j-8.4.0.jar) +if [ "$exec_result" ]; then + echo -e "${YELLOW}The mysql driver package already exists, no need to download it again. Skip this step。${RESET}" else download_file https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.4.0/mysql-connector-j-8.4.0.jar "${DINKY_LIB_DIR}" echo -e "${GREEN}Download is complete, please verify. The downloaded file storage address is： ${DINKY_LIB_DIR}/mysql-connector-j-8.4.0.jar${RESET}" diff --git a/script/bin/init_tools_main.sh b/script/bin/init_tools_main.sh index d8757652f6..6ddbced579 100644 --- a/script/bin/init_tools_main.sh +++ b/script/bin/init_tools_main.sh @@ -51,24 +51,17 @@ function get_home_path() { [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" done DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - RETURN_HOME_PATH=$(dirname "$DIR") -} - - - -if [ -z "${DINKY_HOME}" ]; then - echo -e "${RED}DINKY_HOME environment variable is not set. Attempting to determine the correct path...${RESET}" - get_home_path - APP_HOME="${RETURN_HOME_PATH}" -else - get_home_path - if [ "${DINKY_HOME}" != "${RETURN_HOME_PATH}" ]; then - echo -e "${YELLOW}DINKY_HOME is not equal to the current path, use new path to init: ${RETURN_HOME_PATH}${RESET}" - APP_HOME="${RETURN_HOME_PATH}" + local possible_path=$(dirname "$DIR") + if [ -d "$possible_path" ]; then # Verify that the path obtained is a directory, increasing robustness + RETURN_HOME_PATH="$possible_path" else - echo -e "${GREEN}DINKY_HOME is already set to: ${DINKY_HOME}${RESET}" + echo -e "${RED}Calculated path $possible_path is not a valid directory. Please check the script location or deployment setup.${RESET}" + exit 1 fi -fi +} + +get_home_path +APP_HOME="${RETURN_HOME_PATH}" echo -e "${GREEN}Dinky root path: ${APP_HOME} ${RESET}" @@ -131,7 +124,12 @@ function download_file() { target_file_dir=$2 echo -e "${GREEN}Start downloading $source_url to $target_file_dir...${RESET}" wget -P "${target_file_dir}" "${source_url}" + if [ $? -ne 0 ]; then + echo -e "${RED}Failed to download $source_url to $target_file_dir. Please check the network connection and try again.${RESET}" + return 1 + fi echo -e "${GREEN}Download completed. The downloaded file storage address is: $target_file_dir ${RESET}" + return 0 } export -f download_file