diff --git a/script/clashctl.sh b/script/clashctl.sh index 5a4bf5d..b8ae449 100644 --- a/script/clashctl.sh +++ b/script/clashctl.sh @@ -172,7 +172,7 @@ function clashupdate() { # 如果是自动更新模式,则设置定时任务 [ "$is_auto" = true ] && { - sudo grep -qs 'clashupdate' "$CLASH_CRON_TAB" || echo "0 0 */2 * * . $BASH_RC_ROOT;clashupdate $url" | sudo tee -a "$CLASH_CRON_TAB" >&/dev/null + sudo grep -qs 'clashupdate' "$CLASH_CRON_TAB" || echo "0 0 */2 * * . $SHELL_RC;clashupdate $url" | sudo tee -a "$CLASH_CRON_TAB" >&/dev/null _okcat "定时任务设置成功" && return 0 } diff --git a/script/common.sh b/script/common.sh index 5742b4d..8fd3105 100644 --- a/script/common.sh +++ b/script/common.sh @@ -188,7 +188,7 @@ function _error_quit() { local msg="${emoji} $1" _get_color_msg "$color" "$msg" } - exit >&/dev/null + exec $_SHELL } _is_bind() { diff --git a/uninstall.sh b/uninstall.sh index ce841b9..48cccb7 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -12,6 +12,8 @@ rm -f "/etc/systemd/system/${BIN_KERNEL_NAME}.service" systemctl daemon-reload rm -rf "$CLASH_BASE_DIR" +sed -i '/clashupdate/d' "$CLASH_CRON_TAB" >&/dev/null _set_rc unset + _okcat '✨' '已卸载,相关配置已清除' _quit