From e61b21f0009b190ffb01423c04ae20bf817ee6dd Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Mon, 9 Feb 2026 01:27:21 +0800
Subject: [PATCH] update build.ts

---
 script-meta-v2.json     |  6 +++---
 single-scripts/build.ts | 27 +++++++++++++++++----------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/script-meta-v2.json b/script-meta-v2.json
index 78b4cca..b4d6978 100644
--- a/script-meta-v2.json
+++ b/script-meta-v2.json
@@ -18,12 +18,12 @@
   },
   "build.ts": {
     "script_name": "build.ts",
-    "script_length": 5127,
-    "script_sha256": "ac5a94ad2a52efb8ec16619f9166e7a473848dfebda8a904216a21790e16ee62",
+    "script_length": 5442,
+    "script_sha256": "88e86c845c6cd11e3fc8a42c36a5f62c71dae3f3fb1610938eee8848eb8c0423",
     "script_full_url": "https://git.hatter.ink/hatter/ts-scripts/raw/branch/main/single-scripts/build.ts",
     "single_script_file": true,
     "publish_time": 1770564482429,
-    "update_time": 1770570335255
+    "update_time": 1770571637371
   },
   "cal-bun.ts": {
     "script_name": "cal-bun.ts",
diff --git a/single-scripts/build.ts b/single-scripts/build.ts
index 732d777..12cdea0 100755
--- a/single-scripts/build.ts
+++ b/single-scripts/build.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env runts -- --allow-all
 
 import {
-    execCommandAndStdout,
+    execCommand,
     execCommandShell,
     existsPath,
     log,
@@ -148,15 +148,22 @@ async function buildFile(file: string, flags: any) {
     if (flags["skip-sign"]) {
         log.warn(`Skip signature for file: ${bundleFile}`);
     } else {
-        const signScriptUserPin = await execCommandAndStdout("keyring.rs", [
+        const signScriptUserPinOutput = await execCommand("keyring.rs", [
             "-gRU",
-            "yubikey4white:user-pin",
-        ]);
-        const ret = await execCommandShell("script-sign.rs", [
-            "--pin",
-            signScriptUserPin,
-            bundleFile,
+            "yubikey:script-sign",
         ]);
+        const scriptSignArgs: string[] = [];
+        if (signScriptUserPinOutput.code !== 0) {
+            log.warn(`Read script sign PIN failed: `, signScriptUserPinOutput);
+        } else {
+            scriptSignArgs.push("--pin");
+            scriptSignArgs.push(
+                signScriptUserPinOutput.getStdoutAsStringThenTrim(),
+            );
+        }
+        scriptSignArgs.push(bundleFile);
+
+        const ret = await execCommandShell("script-sign.rs", scriptSignArgs);
         if (ret !== 0) {
             log.error(`Sign script: ${bundleFile} failed, ret code: ${ret}`);
             return;
@@ -168,5 +175,5 @@ async function buildFile(file: string, flags: any) {
 
 await main();
 
-// @SCRIPT-SIGNATURE-V1: yk-r1.ES256.20260209T010454+08:00.MEYCIQCyqK8SqFbxJqCu1fEP
-// IAOM2DklduDdgQ3i//kMBKfUQAIhAPq5xxr5jGvJ6YdpoLr9t95b+JTmSZ+gJq4kEH3XrRLm
+// @SCRIPT-SIGNATURE-V1: yk-r1.ES256.20260209T012700+08:00.MEUCIGGCDSJvi+URM4KdfZrW
+// q04x43Wf4KDFnpuRUJVJp97GAiEAyoTJKX/S7K1/1czB3U6+bKurCgxcG/09AXJSSHSTSo0=