summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/java-tools/templates/pki_java_command_wrapper.in4
-rw-r--r--base/java-tools/templates/pretty_print_cert_command_wrapper.in2
-rw-r--r--base/java-tools/templates/pretty_print_crl_command_wrapper.in2
-rwxr-xr-xbase/scripts/enable_cvs_keywords_in_svn2
-rwxr-xr-xbase/scripts/pkicheck2
-rwxr-xr-xbase/scripts/pkiclihelp2
-rwxr-xr-xbase/scripts/pkimanifest2
-rwxr-xr-xbase/server/sbin/pki-server-nuxwdog2
-rw-r--r--base/server/scripts/operations10
-rwxr-xr-xbase/server/scripts/pkidaemon2
-rwxr-xr-xbase/tps-client/etc/init.d/pki-tpsd2
-rwxr-xr-xbase/tps-client/scripts/nss_pcache2
12 files changed, 17 insertions, 17 deletions
diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in
index 56ca9f1fc..c6dfc6409 100644
--- a/base/java-tools/templates/pki_java_command_wrapper.in
+++ b/base/java-tools/templates/pki_java_command_wrapper.in
@@ -110,7 +110,7 @@ fi
## order this command wrapper uses to find jar files. ##
###############################################################################
-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JNI_JAR_DIR`
CP=${JNI_JAR_DIR}/jss4.jar
CP=/usr/share/java/commons-cli.jar:${CP}
CP=/usr/share/java/commons-codec.jar:${CP}
@@ -124,7 +124,7 @@ CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP}
CP=/usr/share/java/${PRODUCT}/pki-tools.jar:${CP}
export CP
-LOGGING_CONFIG=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $LOGGING_CONFIG`
+LOGGING_CONFIG=`. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $LOGGING_CONFIG`
###############################################################################
## (6) Execute the java command specified by this java command wrapper ##
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 6c1abc7a1..6dc86de27 100644
--- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
@@ -110,7 +110,7 @@ fi
## order this command wrapper uses to find jar files. ##
###############################################################################
-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && . /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 19f8bd8d0..2a74d4d60 100644
--- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in
+++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
@@ -110,7 +110,7 @@ fi
## order this command wrapper uses to find jar files. ##
###############################################################################
-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && . /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/scripts/enable_cvs_keywords_in_svn b/base/scripts/enable_cvs_keywords_in_svn
index fd14a885f..e8f586420 100755
--- a/base/scripts/enable_cvs_keywords_in_svn
+++ b/base/scripts/enable_cvs_keywords_in_svn
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
diff --git a/base/scripts/pkicheck b/base/scripts/pkicheck
index 3ff548d3d..f5e2e17bc 100755
--- a/base/scripts/pkicheck
+++ b/base/scripts/pkicheck
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This script may ONLY be run on Linux!
PKI_OS=`uname`
diff --git a/base/scripts/pkiclihelp b/base/scripts/pkiclihelp
index b9a2ed3ac..1df4df50e 100755
--- a/base/scripts/pkiclihelp
+++ b/base/scripts/pkiclihelp
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
## BEGIN COPYRIGHT BLOCK
## (C) 2014 Red Hat, Inc.
## All rights reserved.
diff --git a/base/scripts/pkimanifest b/base/scripts/pkimanifest
index 31d443cfc..309e81c92 100755
--- a/base/scripts/pkimanifest
+++ b/base/scripts/pkimanifest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
diff --git a/base/server/sbin/pki-server-nuxwdog b/base/server/sbin/pki-server-nuxwdog
index 78ce8fb74..31fff5ede 100755
--- a/base/server/sbin/pki-server-nuxwdog
+++ b/base/server/sbin/pki-server-nuxwdog
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
. /etc/tomcat/tomcat.conf
NAME=$1
diff --git a/base/server/scripts/operations b/base/server/scripts/operations
index ede5f8229..14ab4af56 100644
--- a/base/server/scripts/operations
+++ b/base/server/scripts/operations
@@ -1,4 +1,4 @@
-#!/bin/bash -X
+#!/bin/sh -X
# From "http://fedoraproject.org/wiki/FCNewInit/Initscripts":
#
@@ -1117,7 +1117,7 @@ verify_symlinks()
jni_jar_dir="/usr/share/java"
tomcat_dir="/usr/share/tomcat7"
else
- jni_jar_dir=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+ jni_jar_dir=`. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JNI_JAR_DIR`
tomcat_dir="/usr/share/tomcat"
fi
@@ -1637,12 +1637,12 @@ catalina_sh() {
AUTHBIND_COMMAND=""
if [ "$AUTHBIND" = "yes" -a "$1" = "start" ]; then
JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
- AUTHBIND_COMMAND="/usr/bin/authbind --deep /bin/bash -c "
+ AUTHBIND_COMMAND="/usr/bin/authbind --deep /bin/sh -c "
fi
# Define the command to run Tomcat's catalina.sh as a daemon
# set -a tells sh to export assigned variables to spawned shells.
- TOMCAT_SH="set -a; JAVA_HOME=\"$JAVA_HOME\"; source \"$DEFAULT\"; \
+ TOMCAT_SH="set -a; JAVA_HOME=\"$JAVA_HOME\"; . \"$DEFAULT\"; \
CATALINA_HOME=\"$CATALINA_HOME\"; \
CATALINA_BASE=\"$CATALINA_BASE\"; \
JAVA_OPTS=\"$JAVA_OPTS\"; \
@@ -1661,7 +1661,7 @@ catalina_sh() {
chown $TOMCAT7_USER "$CATALINA_PID" "$CATALINA_BASE"/logs/catalina.out
start-stop-daemon --start -b -u "$TOMCAT7_USER" -g "$TOMCAT7_GROUP" \
-c "$TOMCAT7_USER" -d "$CATALINA_TMPDIR" -p "$CATALINA_PID" \
- -x /bin/bash -- -c "$AUTHBIND_COMMAND $TOMCAT_SH"
+ -x /bin/sh -- -c "$AUTHBIND_COMMAND $TOMCAT_SH"
status="$?"
set +a
return $status
diff --git a/base/server/scripts/pkidaemon b/base/server/scripts/pkidaemon
index e4bc2492f..c9bdecea1 100755
--- a/base/server/scripts/pkidaemon
+++ b/base/server/scripts/pkidaemon
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/base/tps-client/etc/init.d/pki-tpsd b/base/tps-client/etc/init.d/pki-tpsd
index b061d2af8..34e444f17 100755
--- a/base/tps-client/etc/init.d/pki-tpsd
+++ b/base/tps-client/etc/init.d/pki-tpsd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# --- BEGIN COPYRIGHT BLOCK ---
# This program is free software; you can redistribute it and/or modify
diff --git a/base/tps-client/scripts/nss_pcache b/base/tps-client/scripts/nss_pcache
index 6c4b21e93..ef486f005 100755
--- a/base/tps-client/scripts/nss_pcache
+++ b/base/tps-client/scripts/nss_pcache
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# --- BEGIN COPYRIGHT BLOCK ---
# This library is free software; you can redistribute it and/or