From dc8807f3dc0d91637c6a5217300312543d752fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=85=8E=E9=A5=BC=E6=9E=9C=E5=AD=90=E5=8D=B7=E9=B2=A8?=
 =?UTF-8?q?=E9=B1=BC=E8=BE=A3=E6=A4=92?= <yuaotian1998@163.com>
Date: Wed, 12 Feb 2025 11:40:09 +0800
Subject: [PATCH] refactor: Improve MachineGuid backup and error handling
 robustness

- Added fallback backup location when default backup directory is unavailable
- Enhanced GUID parsing with additional null checks
- Improved backup file recovery error handling
- Added warning message for scenarios without backup file
- Refined error recovery mechanism with more comprehensive checks
---
 scripts/run/cursor_win_id_modifier.ps1 | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/run/cursor_win_id_modifier.ps1 b/scripts/run/cursor_win_id_modifier.ps1
index 42b5946..945141e 100644
--- a/scripts/run/cursor_win_id_modifier.ps1
+++ b/scripts/run/cursor_win_id_modifier.ps1
@@ -210,7 +210,7 @@ function Update-MachineGuid {
             exit 1
         }
 
-        # 精确解析GUID
+        # 精确解析GUID（增加空值检查）
         if ($regResult -match "MachineGuid\s+REG_SZ\s+([0-9a-fA-F-]{36})") {
             $originalGuid = $matches[1].ToLower()
             Write-Host "$GREEN[信息]$NC 当前注册表值："
@@ -226,8 +226,12 @@ function Update-MachineGuid {
         $newGuid = [System.Guid]::NewGuid().ToString()
         $registryPath = "HKLM:\SOFTWARE\Microsoft\Cryptography"
         
-        # 创建备份文件
-        $backupFile = "$BACKUP_DIR\MachineGuid_$(Get-Date -Format 'yyyyMMdd_HHmmss').reg"
+        # 创建备份文件（增加路径验证）
+        $backupFile = if (Test-Path $BACKUP_DIR) {
+            "$BACKUP_DIR\MachineGuid_$(Get-Date -Format 'yyyyMMdd_HHmmss').reg"
+        } else {
+            "$env:TEMP\MachineGuid_$(Get-Date -Format 'yyyyMMdd_HHmmss').reg"
+        }
         reg export "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Cryptography" $backupFile | Out-Null
         Write-Host "$GREEN[信息]$NC 注册表项已备份到：$backupFile"
 
@@ -246,11 +250,13 @@ function Update-MachineGuid {
     }
     catch {
         Write-Host "$RED[错误]$NC 注册表操作失败：$_"
-        # 自动恢复备份
-        if (Test-Path $backupFile) {
+        # 自动恢复备份（增加空值检查）
+        if ($backupFile -and (Test-Path $backupFile)) {
             Write-Host "$YELLOW[恢复]$NC 正在从备份恢复..."
             reg import $backupFile | Out-Null
             Write-Host "$GREEN[恢复成功]$NC 已还原原始注册表值"
+        } else {
+            Write-Host "$YELLOW[警告]$NC 未找到备份文件，无法自动恢复"
         }
         exit 1
     }