From eb740c661ea313b46ef12c232a50ce8f810ed42e Mon Sep 17 00:00:00 2001 From: libm Date: Sat, 15 Feb 2025 21:57:09 +0800 Subject: [PATCH] fix: rename dir and variable --- .gitignore | 2 +- README.md | 2 +- install.sh | 20 +++++++-------- resource/bin/.gitkeep | 0 {resource => resources}/Country.mmdb | Bin {resource => resources}/mixin.yaml | 0 {resource => resources}/preview.png | Bin .../zip/clash-linux-amd64-2023.08.17.gz | Bin .../zip/subconverter_linux64.tar.gz | Bin {resource => resources}/zip/yacd.tar.xz | Bin .../zip/yq_linux_amd64.tar.gz | Bin script/common.sh | 24 +++++++++--------- 12 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 resource/bin/.gitkeep rename {resource => resources}/Country.mmdb (100%) rename {resource => resources}/mixin.yaml (100%) rename {resource => resources}/preview.png (100%) rename {resource => resources}/zip/clash-linux-amd64-2023.08.17.gz (100%) rename {resource => resources}/zip/subconverter_linux64.tar.gz (100%) rename {resource => resources}/zip/yacd.tar.xz (100%) rename {resource => resources}/zip/yq_linux_amd64.tar.gz (100%) diff --git a/.gitignore b/.gitignore index 9e52858..6cf69b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .idea .vscode config.yaml -resource/bin/** +resources/bin/** !.gitkeep diff --git a/README.md b/README.md index 19d1dfe..5fd4a03 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 因为有在服务器上使用代理的需求，试过许多开源脚本，总是遇到各种问题。于是自己动手，丰衣足食：对 `Clash` 的安装过程及功能进行了友好封装，使用起来优雅、简单、明确。 -![img](resource/preview.png) +![img](resources/preview.png) ## 快速开始 diff --git a/install.sh b/install.sh index 45c0fad..5b7e311 100755 --- a/install.sh +++ b/install.sh @@ -9,26 +9,26 @@ _get_os [ -d "$CLASH_BASE_DIR" ] && _error_quit "已安装，如需重新安装请先执行卸载脚本" # shellcheck disable=SC2086 -gzip -dc $ZIP_KERNEL >"${TEMP_BIN}/clash" && chmod +x "${TEMP_BIN}/clash" +install -D -m +x <(gzip -dc $ZIP_KERNEL) $BIN_KERNEL # shellcheck disable=SC2086 -tar -xf $ZIP_CONVERT -C "$TEMP_BIN" -_valid_config "$TEMP_CONFIG" || { +tar -xf $ZIP_CONVERT -C "$BIN_BASE_DIR" +_valid_config "$RESOURCES_CONFIG" || { read -r -p '😼 输入订阅链接：' url - _download_config "$url" "$TEMP_CONFIG" || _error_quit "下载失败: 请自行粘贴配置内容到 ${TEMP_CONFIG} 后再执行安装脚本" - _valid_config "$TEMP_CONFIG" || { + _download_config "$url" "$RESOURCES_CONFIG" || _error_quit "下载失败: 请自行粘贴配置内容到 ${RESOURCES_CONFIG} 后再执行安装脚本" + _valid_config "$RESOURCES_CONFIG" || { _failcat "配置无效：尝试进行本地订阅转换..." - _download_convert_config "$TEMP_CONFIG" - _valid_config "$TEMP_CONFIG" || _error_quit '配置无效：请检查配置内容' + _download_convert_config "$RESOURCES_CONFIG" + _valid_config "$RESOURCES_CONFIG" || _error_quit '配置无效：请检查配置内容' } } echo '✅ 配置可用' -mkdir -p "$CLASH_BASE_DIR" echo "$url" >"$CLASH_CONFIG_URL" + /bin/cp -rf script "$CLASH_BASE_DIR" -/bin/ls resource | grep -Ev 'zip|png' | xargs -I {} /bin/cp -rf "resource/{}" "$CLASH_BASE_DIR" +/bin/ls "$RESOURCES_BASE_DIR" | grep -Ev 'zip|png' | xargs -I {} /bin/cp -rf "${$RESOURCES_BASE_DIR}/{}" "$CLASH_BASE_DIR" tar -xf "$ZIP_UI" -C "$CLASH_BASE_DIR" # shellcheck disable=SC2086 -tar -xf $ZIP_YQ -C "${TEMP_BIN}" && install -m +x ${TEMP_BIN}/yq_* "$BIN_YQ" +tar -xf $ZIP_YQ -C "${BIN_BASE_DIR}" && install -m +x ${BIN_BASE_DIR}/yq_* "$BIN_YQ" _merge_config_restart diff --git a/resource/bin/.gitkeep b/resource/bin/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/resource/Country.mmdb b/resources/Country.mmdb similarity index 100% rename from resource/Country.mmdb rename to resources/Country.mmdb diff --git a/resource/mixin.yaml b/resources/mixin.yaml similarity index 100% rename from resource/mixin.yaml rename to resources/mixin.yaml diff --git a/resource/preview.png b/resources/preview.png similarity index 100% rename from resource/preview.png rename to resources/preview.png diff --git a/resource/zip/clash-linux-amd64-2023.08.17.gz b/resources/zip/clash-linux-amd64-2023.08.17.gz similarity index 100% rename from resource/zip/clash-linux-amd64-2023.08.17.gz rename to resources/zip/clash-linux-amd64-2023.08.17.gz diff --git a/resource/zip/subconverter_linux64.tar.gz b/resources/zip/subconverter_linux64.tar.gz similarity index 100% rename from resource/zip/subconverter_linux64.tar.gz rename to resources/zip/subconverter_linux64.tar.gz diff --git a/resource/zip/yacd.tar.xz b/resources/zip/yacd.tar.xz similarity index 100% rename from resource/zip/yacd.tar.xz rename to resources/zip/yacd.tar.xz diff --git a/resource/zip/yq_linux_amd64.tar.gz b/resources/zip/yq_linux_amd64.tar.gz similarity index 100% rename from resource/zip/yq_linux_amd64.tar.gz rename to resources/zip/yq_linux_amd64.tar.gz diff --git a/script/common.sh b/script/common.sh index d77452a..7af1be2 100644 --- a/script/common.sh +++ b/script/common.sh @@ -7,11 +7,10 @@ GH_PROXY='https://gh-proxy.com/' URL_YQ="https://github.com/mikefarah/yq/releases/tag/v4.45.1" URL_CLASH_UI="http://board.zash.run.place" -TEMP_RESOURCE='./resource' -TEMP_BIN="${TEMP_RESOURCE}/bin" -TEMP_CONFIG="${TEMP_RESOURCE}/config.yaml" +RESOURCES_BASE_DIR='./resources' +RESOURCES_CONFIG="${RESOURCES_BASE_DIR}/config.yaml" -ZIP_BASE_DIR="${TEMP_RESOURCE}/zip" +ZIP_BASE_DIR="${RESOURCES_BASE_DIR}/zip" ZIP_CLASH="${ZIP_BASE_DIR}/clash*.gz" ZIP_MIHOMO="${ZIP_BASE_DIR}/mihomo*.gz" ZIP_YQ="${ZIP_BASE_DIR}/yq*.tar.gz" @@ -28,12 +27,18 @@ CLASH_UPDATE_LOG="${CLASH_BASE_DIR}/clashupdate.log" BIN_BASE_DIR="${CLASH_BASE_DIR}/bin" BIN_CLASH="${BIN_BASE_DIR}/clash" +BIN_MIHOMO="${BIN_BASE_DIR}/mihomo" BIN_YQ="${BIN_BASE_DIR}/yq" BIN_SUBCONVERTER="${BIN_BASE_DIR}/subconverter/subconverter" _get_kernel() { + ZIP_KERNEL=$ZIP_CLASH + BIN_KERNEL=$BIN_CLASH # shellcheck disable=SC2086 - [ -e $ZIP_MIHOMO ] && ZIP_KERNEL=$ZIP_MIHOMO || ZIP_KERNEL=$ZIP_CLASH + [ -e $ZIP_MIHOMO ] && { + ZIP_KERNEL=$ZIP_MIHOMO + BIN_KERNEL=$BIN_MIHOMO + } } _get_arch() { @@ -133,11 +138,8 @@ function _valid_env() { } function _valid_config() { - local bin_path=${BIN_CLASH} - [ ! -e $bin_path ] && bin_path=${TEMP_BIN}/clash - [ -e "$1" ] && [ "$(wc -l <"$1")" -gt 1 ] && { - local test_cmd="$bin_path -d $(dirname "$1") -t" + local test_cmd="$BIN_KERNEL -d $(dirname "$1") -t" eval "$test_cmd >&/dev/null" || eval "$test_cmd" } } @@ -182,10 +184,8 @@ _convert_url() { } _start_convert() { - local bin_path="${BIN_SUBCONVERTER}" - [ ! -e "$bin_path" ] && bin_path="${TEMP_BIN}/subconverter/subconverter" # 子shell运行，屏蔽kill时的输出 - (sudo ${bin_path} >&/dev/null &) + (sudo $BIN_SUBCONVERTER >&/dev/null &) local start=$(date +%s%3N) while ! sudo lsof -i :25500 >&/dev/null; do sleep 0.05