From 0454f4ea4c0de0d6464d6d2abc9cc8368f5ea1ea Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Mon, 11 Nov 2019 11:44:12 -0500 Subject: [PATCH] Correct finding snapcraft.yaml in release-tool --- release-tool | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release-tool b/release-tool index b2abbb58..6d217ca9 100755 --- a/release-tool +++ b/release-tool @@ -329,17 +329,17 @@ checkAppStreamInfo() { } checkSnapcraft() { - if [ ! -f snapcraft.yaml ]; then - echo "No snapcraft file found!" + if [ ! -f snap/snapcraft.yaml ]; then + echo "Could not find snap/snapcraft.yaml!" return fi - $GREP -qPzo "version: ${RELEASE_NAME}" snapcraft.yaml + $GREP -qPzo "version: ${RELEASE_NAME}" snap/snapcraft.yaml if [ $? -ne 0 ]; then exitError "'snapcraft.yaml' has not been updated to the '${RELEASE_NAME}' release!" fi - $GREP -qPzo "KEEPASSXC_BUILD_TYPE=Release" snapcraft.yaml + $GREP -qPzo "KEEPASSXC_BUILD_TYPE=Release" snap/snapcraft.yaml if [ $? -ne 0 ]; then exitError "'snapcraft.yaml' is not set for a release build!" fi