Merge pull request #202 from ckb-devrel/v0.3.x

Merge v0.3.3 into master
ckb-devrel · Dec 4, 2024 · ec3cc07 · ec3cc07
2 parents a5333d7 + c1ea100
commit ec3cc07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/cmd/debug.ts b/src/cmd/debug.ts
@@ -5,6 +5,7 @@ import { dumpTransaction } from '../tools/ckb-tx-dumper';
 import path from 'path';
 import { cccA } from '@ckb-ccc/core/advanced';
 import { Network } from '../type/base';
+import { encodeBinPathForTerminal } from '../util/encoding';
 
 export function debugTransaction(txHash: string, network: Network) {
   const txFile = buildTxFileOptionBy(txHash, network);
@@ -91,7 +92,7 @@ export function buildTxFileOptionBy(txHash: string, network: Network) {
     }
     dumpTransaction({ rpc, txJsonFilePath, outputFilePath });
   }
-  const opt = `--tx-file ${outputFilePath}`;
+  const opt = `--tx-file ${encodeBinPathForTerminal(outputFilePath)}`;
   return opt;
 }
 

diff --git a/src/node/install.ts b/src/node/install.ts
@@ -106,7 +106,7 @@ export function getVersionFromBinary(binPath: string): string | null {
       encoding: 'utf-8',
     });
 
-    const versionMatch = versionOutput.match(/(\d+\.\d+\.\d+)/);
+    const versionMatch = versionOutput.match(/(\d+\.\d+\.\d+(-rc\d+)?)/);
     if (versionMatch) {
       return versionMatch[0];
     }