Skip to content

Commit 6b26e44

Browse files
author
“bingtao”
committed
fix: 增强临时文件清理逻辑并优化陷阱信号处理
1 parent a1ca3a0 commit 6b26e44

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

scripts/services/code-server/setup.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ _download_install() {
143143
echo "==> 下载 code-server v${ver} (${plat})" >&2
144144
echo " ${url}" >&2
145145
tmpdir="$(mktemp -d)"
146-
trap 'rm -rf "${tmpdir}"' RETURN
146+
trap '[[ -n "${tmpdir-}" ]] && rm -rf "${tmpdir}"' RETURN
147147
_nlt_github_download_print_accel_hint
148148
if declare -F nlt_pb_curl_to_file >/dev/null 2>&1; then
149149
NLT_PB_LABEL="code-server v${ver}" nlt_pb_curl_to_file "$url" "${tmpdir}/code-server.tgz" || die "下载失败: ${url}"
@@ -153,6 +153,8 @@ _download_install() {
153153
rm -rf "${CODE_SERVER_SERVICE_HOME}/lib" "${CODE_SERVER_SERVICE_HOME}/bin" 2>/dev/null || true
154154
mkdir -p "${CODE_SERVER_SERVICE_HOME}"
155155
tar -xzf "${tmpdir}/code-server.tgz" -C "${CODE_SERVER_SERVICE_HOME}" --strip-components=1
156+
rm -rf "${tmpdir}"
157+
trap - RETURN
156158
[[ -x "${CODE_SERVER_BIN}" ]] || die "解压后未找到可执行文件: ${CODE_SERVER_BIN}"
157159
echo "已安装到 ${CODE_SERVER_SERVICE_HOME}(v${ver}"
158160
}

scripts/services/new-api/setup.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ _download_install() {
223223
echo "==> 下载 new-api ${tag}${NEW_API_BIN}" >&2
224224
echo " ${url}" >&2
225225
tmp="$(mktemp)"
226-
trap 'rm -f "${tmp}"' RETURN
226+
trap '[[ -n "${tmp-}" ]] && rm -f "${tmp}"' RETURN
227227
_nlt_github_download_print_accel_hint
228228
if declare -F nlt_pb_curl_to_file >/dev/null 2>&1; then
229229
NLT_PB_LABEL="new-api ${tag}" nlt_pb_curl_to_file "$url" "${tmp}" || die "下载失败: ${url}"
@@ -232,6 +232,8 @@ _download_install() {
232232
fi
233233
mkdir -p "${NEW_API_SERVICE_HOME}/bin"
234234
install -m 0755 "${tmp}" "${NEW_API_BIN}"
235+
rm -f "${tmp}"
236+
trap - RETURN
235237
[[ -x "${NEW_API_BIN}" ]] || die "安装后二进制不可执行: ${NEW_API_BIN}"
236238
echo "已安装 ${NEW_API_BIN}${tag} / ${asset}"
237239
}

0 commit comments

Comments
 (0)