Correct finding snapcraft.yaml in release-tool

This commit is contained in:
Jonathan White 2019-11-11 11:44:12 -05:00
parent d37e71b793
commit 0454f4ea4c

View File

@ -329,17 +329,17 @@ checkAppStreamInfo() {
} }
checkSnapcraft() { checkSnapcraft() {
if [ ! -f snapcraft.yaml ]; then if [ ! -f snap/snapcraft.yaml ]; then
echo "No snapcraft file found!" echo "Could not find snap/snapcraft.yaml!"
return return
fi fi
$GREP -qPzo "version: ${RELEASE_NAME}" snapcraft.yaml $GREP -qPzo "version: ${RELEASE_NAME}" snap/snapcraft.yaml
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exitError "'snapcraft.yaml' has not been updated to the '${RELEASE_NAME}' release!" exitError "'snapcraft.yaml' has not been updated to the '${RELEASE_NAME}' release!"
fi fi
$GREP -qPzo "KEEPASSXC_BUILD_TYPE=Release" snapcraft.yaml $GREP -qPzo "KEEPASSXC_BUILD_TYPE=Release" snap/snapcraft.yaml
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exitError "'snapcraft.yaml' is not set for a release build!" exitError "'snapcraft.yaml' is not set for a release build!"
fi fi