summaryrefslogtreecommitdiffstats
path: root/base/java-tools/templates
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2016-07-22 18:38:19 -0600
committerMatthew Harmsen <mharmsen@redhat.com>2016-07-22 18:38:19 -0600
commita307cf68e91327ddbef4b9d7e2bbd3991354831f (patch)
tree524198cf6830da6087d6042a4f1d106be09f3b83 /base/java-tools/templates
parent215d07d0754a5397e5008e98fe42626e8de9e399 (diff)
downloadpki-a307cf68e91327ddbef4b9d7e2bbd3991354831f.tar.gz
pki-a307cf68e91327ddbef4b9d7e2bbd3991354831f.tar.xz
pki-a307cf68e91327ddbef4b9d7e2bbd3991354831f.zip
Allow PrettyPrintCert to process HEADERs and TRAILERs.
* PKI TRAC Ticket #2399 - Dogtag 10.3.5: Miscellaneous Enhancements Checked-in under one-liner/trivial rule.
Diffstat (limited to 'base/java-tools/templates')
-rw-r--r--base/java-tools/templates/pretty_print_cert_command_wrapper.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
index 63451d0c5..882e7a17e 100644
--- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
@@ -137,7 +137,7 @@ if [ $# -eq 1 ] ||
then
if [ "$1" = "-simpleinfo" ]
then
- file $2 | grep 'ASCII text' > /dev/null
+ file $2 | grep -E 'ASCII text|PEM certificate' > /dev/null
if [ $? -ne 0 ] ; then
${JAVA} ${JAVA_OPTIONS} -cp ${CP} com.netscape.cmstools.${COMMAND}
printf "\n"
@@ -147,7 +147,7 @@ then
exit 255
fi
else
- file $1 | grep 'ASCII text' > /dev/null
+ file $1 | grep -E 'ASCII text|PEM certificate' > /dev/null
if [ $? -ne 0 ] ; then
${JAVA} ${JAVA_OPTIONS} -cp ${CP} com.netscape.cmstools.${COMMAND}
printf "\n"