diff --git a/script/clashctl.sh b/script/clashctl.sh index 50a53a4..8aead24 100644 --- a/script/clashctl.sh +++ b/script/clashctl.sh @@ -178,18 +178,18 @@ function clashupdate() { sudo cat "$CLASH_CONFIG_RAW" | sudo tee "$CLASH_CONFIG_RAW_BAK" >&/dev/null _rollback() { - _failcat '👋' "$1" + _failcat '🍂' "$1" sudo cat "$CLASH_CONFIG_RAW_BAK" | sudo tee "$CLASH_CONFIG_RAW" >&/dev/null - _failcat '❌' "[$(date +"%Y-%m-%d %H:%M:%S")] 订阅更新失败:$url" 2>&1 | sudo tee -a "${CLASH_UPDATE_LOG}" + _failcat '❌' "[$(date +"%Y-%m-%d %H:%M:%S")] 订阅更新失败:$url" 2>&1 | sudo tee -a "${CLASH_UPDATE_LOG}" >&/dev/null _error_quit } - _download_config "$CLASH_CONFIG_RAW" "$url" || _rollback "下载失败:已回滚配置" - _valid_config "$CLASH_CONFIG_RAW" || _rollback "配置无效:已回滚配置" + _download_config "$CLASH_CONFIG_RAW" "$url" || _rollback "更新失败:已回滚配置" + _valid_config "$CLASH_CONFIG_RAW" || _rollback "转换失败:已回滚配置,请检查日志:$BIN_SUBCONVERTER_LOG" - _merge_config_restart + _merge_config_restart && _okcat '🍃' '订阅更新成功' echo "$url" | sudo tee "$CLASH_CONFIG_URL" >&/dev/null - _okcat '✅' "[$(date +"%Y-%m-%d %H:%M:%S")] 订阅更新成功:$url" | sudo tee -a "${CLASH_UPDATE_LOG}" + _okcat '✅' "[$(date +"%Y-%m-%d %H:%M:%S")] 订阅更新成功:$url" | sudo tee -a "${CLASH_UPDATE_LOG}" >&/dev/null } function clashmixin() { diff --git a/script/common.sh b/script/common.sh index 1c35355..0470752 100644 --- a/script/common.sh +++ b/script/common.sh @@ -33,6 +33,7 @@ BIN_SUBCONVERTER_DIR="${BIN_BASE_DIR}/subconverter" BIN_SUBCONVERTER_CONFIG="$BIN_SUBCONVERTER_DIR/pref.yml" BIN_SUBCONVERTER_PORT="25500" BIN_SUBCONVERTER="${BIN_SUBCONVERTER_DIR}/subconverter" +BIN_SUBCONVERTER_LOG="${BIN_SUBCONVERTER_DIR}/latest.log" # 默认集成、安装mihomo内核 # 移除/删除mihomo:下载安装clash内核 @@ -271,11 +272,11 @@ _start_convert() { } local start=$(date +%s) # 子shell运行,屏蔽kill时的输出 - (sudo $BIN_SUBCONVERTER >&/dev/null &) + (sudo $BIN_SUBCONVERTER >&$BIN_SUBCONVERTER_LOG &) while ! _is_bind "$BIN_SUBCONVERTER_PORT" >&/dev/null; do sleep 0.05s local now=$(date +%s) - [ $((now - start)) -gt 1 ] && _error_quit "订阅转换服务未启动,请检查并重试:$BIN_SUBCONVERTER_DIR" + [ $((now - start)) -gt 1 ] && _error_quit "订阅转换服务未启动,请检查日志:$BIN_SUBCONVERTER_LOG" done } @@ -299,6 +300,6 @@ function _download_config() { _okcat '🍃' '下载成功:内核验证配置...' _valid_config "$dest" || { _failcat '🍂' "验证失败:尝试订阅转换..." - _download_convert_config "$dest" "$url" || return 1 + _download_convert_config "$dest" "$url" || _failcat '🍂' "转换失败:请检查日志:$BIN_SUBCONVERTER_LOG" } }