mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-01-18 21:34:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add -datadir to when obtaining bitcoind -version to avoid using default datadir (#5574)

Browse Source
This commit is contained in:
Chris Stewart 2024-05-08 20:59:53 -05:00 committed by GitHub
parent f300bed25a
commit 18cb4f3ddf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala
View File

@ -52,8 +52,13 @@ sealed trait BitcoindInstanceLocal extends BitcoindInstance {
val binaryPath = binary.getAbsolutePath
val versionT = Try {
val cmd =
Seq(binaryPath, s"-datadir=${datadir.toPath.toString}", "--version")
val foundVersion =
Seq(binaryPath, "--version").!!.split(Properties.lineSeparator).head
cmd
.!!(NativeProcessFactory.processLogger)
.split(Properties.lineSeparator)
.head
.split(" ")
.last
BitcoindVersion.findVersion(foundVersion).getOrElse {
@ -69,7 +74,7 @@ sealed trait BitcoindInstanceLocal extends BitcoindInstance {
case Success(value) => value
case Failure(exception) =>
logger.error("Error getting bitcoind version", exception)
BitcoindVersion.newest
throw exception
}
}
}