From b88754da750bc87fe9ae99d0571fc4432d87f8d3 Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Wed, 26 Nov 2014 11:19:41 -0700
Subject: [PATCH] Remove legacy multilib JNI_JAR_DIR logic (revised)

* Bugzilla Bug #1165351 - Errata TPS test fails due to dependent packages
  not found - fixed shell tests
---
 base/java-tools/templates/pki_java_command_wrapper.in          | 4 +---
 base/java-tools/templates/pretty_print_cert_command_wrapper.in | 4 +---
 base/java-tools/templates/pretty_print_crl_command_wrapper.in  | 4 +---
 base/server/scripts/operations                                 | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in
index e9bea58..2c13d66 100644
--- a/base/java-tools/templates/pki_java_command_wrapper.in
+++ b/base/java-tools/templates/pki_java_command_wrapper.in
@@ -125,9 +125,7 @@ fi
 ##      order this command wrapper uses to find jar files.                   ##
 ###############################################################################
 
-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR`
-# Override JNI_JAR_DIR using a user-defined value if one exists
-JNI_JAR_DIR=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
 CP=${JNI_JAR_DIR}/jss4.jar
 CP=/usr/share/java/commons-codec.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
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 0c15184..cd4888a 100644
--- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
@@ -125,9 +125,7 @@ fi
 ##      order this command wrapper uses to find jar files.                   ##
 ###############################################################################
 
-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR`
-# Override JNI_JAR_DIR using a user-defined value if one exists
-JNI_JAR_DIR=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
 CP=${JNI_JAR_DIR}/jss4.jar
 CP=/usr/share/java/commons-codec.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
diff --git a/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
index 02e223c..3596fae 100644
--- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in
+++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
@@ -125,9 +125,7 @@ fi
 ##      order this command wrapper uses to find jar files.                   ##
 ###############################################################################
 
-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR`
-# Override JNI_JAR_DIR using a user-defined value if one exists
-JNI_JAR_DIR=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
 CP=${JNI_JAR_DIR}/jss4.jar
 
 CP=/usr/share/java/commons-codec.jar:${CP}
diff --git a/base/server/scripts/operations b/base/server/scripts/operations
index e89f1f6..92d01c3 100644
--- a/base/server/scripts/operations
+++ b/base/server/scripts/operations
@@ -1059,9 +1059,7 @@ verify_symlinks()
     declare -A systemd_symlinks
 
     # Dogtag 10 Conditional Variables
-    jni_jar_dir=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR`
-    # Override jni_jar_dir using a user-defined value if one exists
-    jni_jar_dir=`source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+    jni_jar_dir=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
 
     # Dogtag 10 Symbolic Link Target Variables
     java_dir="/usr/share/java"
-- 
1.8.3.1