From dd2fd23e59baa5aca6e52c25d25de7d4d4b7aba8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 21 Jul 2021 22:57:10 -0400 Subject: [PATCH] common/hooks/post-install/04-create-xbps-metadata-scripts.sh: fix return code of failed trigger runs --- .../hooks/post-install/04-create-xbps-metadata-scripts.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh index 8bb86c4487a5..1d41b58a4ee6 100644 --- a/common/hooks/post-install/04-create-xbps-metadata-scripts.sh +++ b/common/hooks/post-install/04-create-xbps-metadata-scripts.sh @@ -326,8 +326,7 @@ _EOF if ! [[ $j =~ pre-${action} ]]; then continue fi - printf "\t\${TRIGGERSDIR}/$f run $j \${PKGNAME} \${VERSION} \${UPDATE} \${CONF_FILE}\n" >> $tmpf - printf "\t[ \$? -ne 0 ] && exit \$?\n" >> $tmpf + printf "\t\${TRIGGERSDIR}/$f run $j \"\${PKGNAME}\" \"\${VERSION}\" \"\${UPDATE}\" \"\${CONF_FILE}\" || exit\n" >> $tmpf done done printf "\t;;\n" >> $tmpf @@ -338,8 +337,7 @@ _EOF if ! [[ $j =~ post-${action} ]]; then continue fi - printf "\t\${TRIGGERSDIR}/$f run $j \${PKGNAME} \${VERSION} \${UPDATE} \${CONF_FILE}\n" >> $tmpf - printf "\t[ \$? -ne 0 ] && exit \$?\n" >> $tmpf + printf "\t\${TRIGGERSDIR}/$f run $j \"\${PKGNAME}\" \"\${VERSION}\" \"\${UPDATE}\" \"\${CONF_FILE}\" || exit\n" >> $tmpf done done printf "\t;;\n" >> $tmpf