@aiyiran/myclaw 1.0.13 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/wsl2.js +29 -14
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aiyiran/myclaw",
3
- "version": "1.0.13",
3
+ "version": "1.0.15",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "bin": {
package/wsl2.js CHANGED
@@ -94,9 +94,7 @@ if (-Not $userInput) {
94
94
  Write-Host ' 下载完成!'
95
95
  } catch {
96
96
  Write-Host ' [失败] 下载失败,请检查网络后重试 myclaw wsl2'
97
- Write-Host ''; Write-Host '按任意键关闭...'
98
- $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
99
- exit 1
97
+ throw '下载失败'
100
98
  }
101
99
  } else {
102
100
  Write-Host ' 使用上次缓存的文件'
@@ -149,6 +147,7 @@ function runPhase1() {
149
147
  const ps = `
150
148
  $ErrorActionPreference = 'Continue'
151
149
  $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 1'
150
+ try {
152
151
  Write-Host ''
153
152
  Write-Host '========================================'
154
153
  Write-Host ' MyClaw WSL2 安装 - 阶段 1/2'
@@ -196,10 +195,7 @@ ${askMsi}
196
195
  Start-Process msiexec.exe -ArgumentList "/i \`"$msi\`" /quiet /norestart" -Wait -NoNewWindow
197
196
  Write-Host ' [OK]'
198
197
  } catch {
199
- Write-Host ' [失败]'
200
- Write-Host ''; Write-Host '按任意键关闭...'
201
- $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
202
- exit 1
198
+ Write-Host ' [失败] 安装出错'
203
199
  }
204
200
  }
205
201
 
@@ -211,9 +207,18 @@ Write-Host ' >>> 请立即 [重启电脑] <<<'
211
207
  Write-Host ''
212
208
  Write-Host ' 重启后运行: myclaw wsl2'
213
209
  Write-Host '========================================'
214
- Write-Host ''
215
- Write-Host '按任意键关闭此窗口...'
216
- $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
210
+
211
+ } catch {
212
+ Write-Host ''
213
+ Write-Host '========================================'
214
+ Write-Host " [异常] 发生错误: $_"
215
+ Write-Host ' 请截图此窗口内容后联系老师'
216
+ Write-Host '========================================'
217
+ } finally {
218
+ Write-Host ''
219
+ Write-Host '按任意键关闭此窗口...'
220
+ $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
221
+ }
217
222
  `;
218
223
 
219
224
  if (launchElevatedPS(ps)) {
@@ -248,11 +253,12 @@ function runPhase2() {
248
253
  const ps = `
249
254
  $ErrorActionPreference = 'Continue'
250
255
  $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 2'
256
+ try {
251
257
  Write-Host ''
252
258
  Write-Host '========================================'
253
259
  Write-Host ' MyClaw WSL2 安装 - 阶段 2/2'
254
260
  Write-Host ' 导入预制 Linux 环境'
255
- Write-Host '========================================'
261
+ Write-Host '========================================'
256
262
  Write-Host ''
257
263
 
258
264
  $dir = "$env:LOCALAPPDATA\\myclaw"
@@ -304,9 +310,18 @@ if ($installed) {
304
310
  Write-Host ' [失败] 请检查后重试: myclaw wsl2'
305
311
  }
306
312
  Write-Host '========================================'
307
- Write-Host ''
308
- Write-Host '按任意键关闭此窗口...'
309
- $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
313
+
314
+ } catch {
315
+ Write-Host ''
316
+ Write-Host '========================================'
317
+ Write-Host " [异常] 发生错误: $_"
318
+ Write-Host ' 请截图此窗口内容后联系老师'
319
+ Write-Host '========================================'
320
+ } finally {
321
+ Write-Host ''
322
+ Write-Host '按任意键关闭此窗口...'
323
+ $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
324
+ }
310
325
  `;
311
326
 
312
327
  if (launchElevatedPS(ps)) {