From afc8c70b956fea21aca1073432f5878dc4b2a2a5 Mon Sep 17 00:00:00 2001 From: Orion Date: Mon, 8 Jun 2026 10:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(shortcuts):=20?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=9C=B0=E5=9C=A8=E4=B8=B4=E6=97=B6=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E5=88=9B=E5=BB=BA=E4=B8=B4=E6=97=B6=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shortcuts/vm-permission-fixer-bootstrap.sh | 7 ++++--- shortcuts/vm-permission-fixer.sh | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/shortcuts/vm-permission-fixer-bootstrap.sh b/shortcuts/vm-permission-fixer-bootstrap.sh index a488496..f657713 100755 --- a/shortcuts/vm-permission-fixer-bootstrap.sh +++ b/shortcuts/vm-permission-fixer-bootstrap.sh @@ -5,10 +5,11 @@ set -euo pipefail REMOTE="${VM_FIXER_REMOTE:-https://git.orionc.me/orion/script/raw/branch/main/shortcuts/vm-permission-fixer.sh}" -TEMP="$(mktemp "${TMPDIR:-/tmp}/vm-permission-fixer.XXXXXX.sh")" +TEMP_DIR="$(mktemp -d "${TMPDIR:-/tmp}/vm-permission-fixer.XXXXXX")" +TEMP="${TEMP_DIR}/vm-permission-fixer.sh" cleanup() { - rm -f "$TEMP" + rm -rf "$TEMP_DIR" } trap cleanup EXIT INT TERM @@ -29,4 +30,4 @@ if [[ -n "${VM_FIXER_SHA256:-}" ]]; then fi fi -exec /usr/bin/env bash "$TEMP" "$@" +/usr/bin/env bash "$TEMP" "$@" diff --git a/shortcuts/vm-permission-fixer.sh b/shortcuts/vm-permission-fixer.sh index b8391f2..5b22096 100755 --- a/shortcuts/vm-permission-fixer.sh +++ b/shortcuts/vm-permission-fixer.sh @@ -12,10 +12,11 @@ CURRENT_USER="$(id -un)" VM_PATH="${VM_FIXER_VM_PATH:-/Users/Shared/Parallels/VM/Windows 11/Windows 11.pvm}" LOG_FILE="${VM_FIXER_LOG_FILE:-/Users/${CURRENT_USER}/Library/Logs/vm_permission_fix.log}" KEYCHAIN_SERVICE="${VM_FIXER_KEYCHAIN_SERVICE:-vm-permission-fixer-sudo-password}" -ASKPASS_TEMP="$(mktemp "${TMPDIR:-/tmp}/vm-permission-fixer-askpass.XXXXXX.sh")" +ASKPASS_TEMP_DIR="$(mktemp -d "${TMPDIR:-/tmp}/vm-permission-fixer-askpass.XXXXXX")" +ASKPASS_TEMP="${ASKPASS_TEMP_DIR}/askpass.sh" cleanup() { - rm -f "$ASKPASS_TEMP" + rm -rf "$ASKPASS_TEMP_DIR" } trap cleanup EXIT INT TERM