From bd6e8b8965ba3f68f1034213b7d933423828e9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Fri, 22 Feb 2019 16:39:54 +0100 Subject: [PATCH] Fix spec usage of softhsm helper Output produced by helper is multiline starting with comment. Unless it is enclosed in quotes, it will be concatenated into single line. Fixes commit fa1631eef77a827e0df168df837e84c2d8790ce5 --- bind.spec | 2 +- setup-named-softhsm.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bind.spec b/bind.spec index 9165139..4c81673 100644 --- a/bind.spec +++ b/bind.spec @@ -805,7 +805,7 @@ sed -e '/^tp:.*-pkcs11/ d' -e '/^tp:\s*lwres/ d' \ %check %if %{with PKCS11} # Tests require initialization of pkcs11 token - eval $(bash %{SOURCE48} -A "`pwd`/softhsm-tokens") + eval "$(bash %{SOURCE48} -A "`pwd`/softhsm-tokens")" %endif %if %{with UNITTEST} diff --git a/setup-named-softhsm.sh b/setup-named-softhsm.sh index a13c91e..c0f8445 100755 --- a/setup-named-softhsm.sh +++ b/setup-named-softhsm.sh @@ -4,8 +4,9 @@ # in custom location. Is useful to store tokens in non-standard location. # # Output can be evaluated from bash, it will prepare it for usage of temporary tokens. +# Quotes around eval are mandatory! # Recommended use: -# eval $(bash setup-named-softhsm.sh -A) +# eval "$(bash setup-named-softhsm.sh -A)" # SOFTHSM2_CONF="$1"