From edd13360ede0114555688cc109298587ea530f35 Mon Sep 17 00:00:00 2001 From: edouardparis Date: Fri, 17 Jan 2025 12:13:41 +0100 Subject: [PATCH] fix release and sign scripts Use LIANA_PREFIX var everywhere, remove capital letter from macos binaries. --- contrib/release/release.sh | 6 +++--- contrib/release/sign.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/release/release.sh b/contrib/release/release.sh index 96ff5b9e..1fa1e963 100755 --- a/contrib/release/release.sh +++ b/contrib/release/release.sh @@ -56,7 +56,7 @@ NIX_BUILD_DIR="$(nix path-info .#release)" unzip ../contrib/release/debian/package.zip sed -i "s/VERSION_PLACEHOLDER/$VERSION/g" ./package/DEBIAN/control cp "$BUILD_DIR/x86_64-unknown-linux-gnu/release/lianad" "$BUILD_DIR/x86_64-unknown-linux-gnu/release/liana-cli" "$BUILD_DIR/x86_64-unknown-linux-gnu/release/liana-gui" ../README.md ./package/usr/bin/ - DIRNAME="liana_$VERSION-1_amd64" + DIRNAME="$LIANA_PREFIX-1_amd64" mv ./package "$DIRNAME" dpkg-deb -Zxz --build --root-owner-group "$DIRNAME" mv "$DIRNAME.deb" "$RELEASE_DIR" @@ -84,8 +84,8 @@ NIX_BUILD_DIR="$(nix path-info .#release)" unzip ../contrib/release/macos/Liana.app.zip sed -i "s/VERSION_PLACEHOLDER/$VERSION/g" ./Liana.app/Contents/Info.plist cp "$NIX_BUILD_DIR/universal2-apple-darwin/liana-gui" ./Liana.app/Contents/MacOS/Liana - zip_archive "Liana-$VERSION-noncodesigned.zip" Liana.app - mv "Liana-$VERSION-noncodesigned.zip" "$RELEASE_DIR/" + zip_archive "$LIANA_PREFIX-macos-noncodesigned.zip" Liana.app + mv "$LIANA_PREFIX-macos-noncodesigned.zip" "$RELEASE_DIR/" ) find "$RELEASE_DIR" -type f ! -name "$LIANA_PREFIX-shasums.txt" -exec sha256sum {} + | sed "s|$RELEASE_DIR/||" | tee "$RELEASE_DIR/$LIANA_PREFIX-shasums.txt" diff --git a/contrib/release/sign.sh b/contrib/release/sign.sh index 76cf166d..123e701f 100755 --- a/contrib/release/sign.sh +++ b/contrib/release/sign.sh @@ -85,9 +85,9 @@ sign_with_rcodesign() { --api-key-path "$NOTARY_API_CREDS_FILE" \ --staple Liana.app - zip_archive "Liana-$VERSION.zip" Liana.app - mv "Liana-$VERSION.zip" "$RELEASE_DIR/" - sha256sum "$RELEASE_DIR/Liana-$VERSION.zip" | tee -a "$RELEASE_DIR/$LIANA_PREFIX-shasums.txt" + zip_archive "$LIANA_PREFIX-macos.zip" Liana.app + mv "$LIANA_PREFIX-macos.zip" "$RELEASE_DIR/" + sha256sum "$RELEASE_DIR/$LIANA_PREFIX-macos.zip" | sed "s|$RELEASE_DIR/||" | tee -a "$RELEASE_DIR/$LIANA_PREFIX-shasums.txt" } if [ "$#" -lt 1 ]; then