Skip to content

Commit ec3cc07

Browse files
authored
Merge pull request #202 from ckb-devrel/v0.3.x
Merge v0.3.3 into master
2 parents a5333d7 + c1ea100 commit ec3cc07

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/cmd/debug.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { dumpTransaction } from '../tools/ckb-tx-dumper';
55
import path from 'path';
66
import { cccA } from '@ckb-ccc/core/advanced';
77
import { Network } from '../type/base';
8+
import { encodeBinPathForTerminal } from '../util/encoding';
89

910
export function debugTransaction(txHash: string, network: Network) {
1011
const txFile = buildTxFileOptionBy(txHash, network);
@@ -91,7 +92,7 @@ export function buildTxFileOptionBy(txHash: string, network: Network) {
9192
}
9293
dumpTransaction({ rpc, txJsonFilePath, outputFilePath });
9394
}
94-
const opt = `--tx-file ${outputFilePath}`;
95+
const opt = `--tx-file ${encodeBinPathForTerminal(outputFilePath)}`;
9596
return opt;
9697
}
9798

src/node/install.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export function getVersionFromBinary(binPath: string): string | null {
106106
encoding: 'utf-8',
107107
});
108108

109-
const versionMatch = versionOutput.match(/(\d+\.\d+\.\d+)/);
109+
const versionMatch = versionOutput.match(/(\d+\.\d+\.\d+(-rc\d+)?)/);
110110
if (versionMatch) {
111111
return versionMatch[0];
112112
}

0 commit comments

Comments
 (0)