From a20047f99f373c3f36a5644729f10356c15b989f Mon Sep 17 00:00:00 2001
From: Niklas Dusenlund <niklas@dusenlund.se>
Date: Wed, 14 Apr 2021 11:33:32 +0200
Subject: [PATCH] release: Update toml-echo instructions

---
 bitbox-bridge/release/Dockerfile                       | 2 +-
 bitbox-bridge/release/README.md                        | 1 +
 bitbox-bridge/release/darwin/release.sh                | 3 ---
 bitbox-bridge/release/windows/wix/README.md            | 2 +-
 bitbox-bridge/release/windows/wix/package-unsigned.cmd | 2 +-
 bitbox-bridge/release/windows/wix/package.cmd          | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bitbox-bridge/release/Dockerfile b/bitbox-bridge/release/Dockerfile
index 4178101..ffc91bc 100644
--- a/bitbox-bridge/release/Dockerfile
+++ b/bitbox-bridge/release/Dockerfile
@@ -79,7 +79,7 @@ RUN rustup target add x86_64-apple-darwin
 
 ##############################
 # toml-echo is a tool for echoing toml variables (like the package.version)
-RUN CARGO_HOME=/opt/cargo cargo install toml-echo
+RUN CARGO_HOME=/opt/cargo cargo install --version 0.3.0 toml-echo
 
 
 ##############################
diff --git a/bitbox-bridge/release/README.md b/bitbox-bridge/release/README.md
index a613170..0b9709c 100644
--- a/bitbox-bridge/release/README.md
+++ b/bitbox-bridge/release/README.md
@@ -15,6 +15,7 @@ Packages (deb/rpm/tar.gz2) will be created without further work.
 * Run `package.cmd`
 
 ## OSX
+* Install "toml-echo", `cargo install --version 0.3.0 toml-echo`.
 * Copy the whole project to an OSX machine
 * Run `bitbox-bridge/release/darwin/package.sh`
 
diff --git a/bitbox-bridge/release/darwin/release.sh b/bitbox-bridge/release/darwin/release.sh
index 0c62fb2..443cc29 100755
--- a/bitbox-bridge/release/darwin/release.sh
+++ b/bitbox-bridge/release/darwin/release.sh
@@ -8,9 +8,6 @@ CARGO_HOME=/tmp/cargo \
 TARGET_CC=x86_64-apple-darwin14-clang \
 cargo build --target x86_64-apple-darwin --release
 
-NAME=BitBoxBridge
-VERSION=$(toml-echo bitbox-bridge/Cargo.toml package.version)
-
 (
 	cd bitbox-bridge/release/darwin
 	mkdir -p tmp/opt/shiftcrypto/bitbox-bridge/bin
diff --git a/bitbox-bridge/release/windows/wix/README.md b/bitbox-bridge/release/windows/wix/README.md
index 56c94d7..f8c9dbe 100644
--- a/bitbox-bridge/release/windows/wix/README.md
+++ b/bitbox-bridge/release/windows/wix/README.md
@@ -1,7 +1,7 @@
 # Package
 
 1. install wix toolset and visual studio
-2. install toml-echo: `cargo install toml-echo`
+2. install toml-echo: `cargo install --version 0.3.0 toml-echo`
 3. launch X64 native tools command prompt for VS 20XX
 4. run package-unsigned.cmd
 
diff --git a/bitbox-bridge/release/windows/wix/package-unsigned.cmd b/bitbox-bridge/release/windows/wix/package-unsigned.cmd
index 8b7a320..19f3d38 100644
--- a/bitbox-bridge/release/windows/wix/package-unsigned.cmd
+++ b/bitbox-bridge/release/windows/wix/package-unsigned.cmd
@@ -1,4 +1,4 @@
-FOR /F "tokens=* USEBACKQ" %%F IN (`toml-echo ..\..\..\Cargo.toml package.version`) DO (
+FOR /F "tokens=* USEBACKQ" %%F IN (`toml-echo Cargo.toml package.version`) DO (
 	SET VERSION=%%F
 )
 ECHO Packaging version %VERSION%
diff --git a/bitbox-bridge/release/windows/wix/package.cmd b/bitbox-bridge/release/windows/wix/package.cmd
index f840f2a..4f2017d 100644
--- a/bitbox-bridge/release/windows/wix/package.cmd
+++ b/bitbox-bridge/release/windows/wix/package.cmd
@@ -1,4 +1,4 @@
-FOR /F "tokens=* USEBACKQ" %%F IN (`toml-echo ..\..\..\Cargo.toml package.version`) DO (
+FOR /F "tokens=* USEBACKQ" %%F IN (`toml-echo Cargo.toml package.version`) DO (
 	SET VERSION=%%F
 )
 ECHO Packaging version %VERSION%