From 9835b8a52ff08bbd749843b4395591652f5725a4 Mon Sep 17 00:00:00 2001 From: Carson McManus Date: Fri, 23 Jun 2023 15:21:46 -0400 Subject: [PATCH] change built artifact name from `steamguard-cli` to `steamguard` (#208) --- Cargo.toml | 8 ++++++-- scripts/full-release.sh | 4 ++-- scripts/package-deb.sh | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 57c615d..6d1aa54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,10 +19,14 @@ license = "GPL-3.0-or-later" default = ["qr"] qr = ["qrcode"] -[[bin]] -name = "steamguard-cli" +# [[bin]] +# name = "steamguard-cli" # filename = "steamguard" # TODO: uncomment when https://github.com/rust-lang/cargo/issues/9778 is stablized. +[[bin]] +name = "steamguard" +path = "src/main.rs" + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/scripts/full-release.sh b/scripts/full-release.sh index 322ed14..b64d79c 100755 --- a/scripts/full-release.sh +++ b/scripts/full-release.sh @@ -83,8 +83,8 @@ cross build --release "--target=$BUILD_TARGET2" ./scripts/package-deb.sh -BIN_PATH="target/$BUILD_TARGET/release/steamguard-cli" -BIN_PATH2="target/$BUILD_TARGET2/release/steamguard-cli.exe" +BIN_PATH="target/$BUILD_TARGET/release/steamguard" +BIN_PATH2="target/$BUILD_TARGET2/release/steamguard.exe" RAW_VERSION="$("$BIN_PATH" --version | cut -d " " -f 2)" TAGGED_VERSION="$(git tag | grep "^v" | tail -n 1 | tr -d v)" if [[ "v$RAW_VERSION" != "v$TAGGED_VERSION" ]]; then diff --git a/scripts/package-deb.sh b/scripts/package-deb.sh index 7dbe8ce..ccc946c 100755 --- a/scripts/package-deb.sh +++ b/scripts/package-deb.sh @@ -10,7 +10,7 @@ if ! which cross; then cargo install cross fi -BIN_PATH="target/x86_64-unknown-linux-musl/release/steamguard-cli" +BIN_PATH="target/x86_64-unknown-linux-musl/release/steamguard" if [[ ! -f "$BIN_PATH" ]]; then echo "ERROR: Could not find release binaries, building them..." cross build --release --target=x86_64-unknown-linux-musl @@ -24,9 +24,6 @@ mkdir -p "$TEMP_PKG_PATH/etc/bash_completion.d" mkdir -p "$TEMP_PKG_PATH/DEBIAN" cp "$BIN_PATH" "$TEMP_PKG_PATH/usr/local/bin/steamguard" -pushd "$TEMP_PKG_PATH/usr/local/bin/" -ln -s "./steamguard" "./steamguard-cli" -popd "$BIN_PATH" completion --shell bash > "$TEMP_PKG_PATH/etc/bash_completion.d/steamguard" cat <> $TEMP_PKG_PATH/DEBIAN/control