summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2016-04-26 11:06:10 -0600
committerMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2016-04-26 14:53:33 -0600
commit4708983b88d33cb1b1c2cc913499c18dfc7d6959 (patch)
tree32c9301340a090b4fb8a69b5ac46c547e23ae7da /scripts
parent33d02d644a1f61bce25698ec28a8ce9890ee3067 (diff)
downloadpki-4708983b88d33cb1b1c2cc913499c18dfc7d6959.tar.gz
pki-4708983b88d33cb1b1c2cc913499c18dfc7d6959.tar.xz
pki-4708983b88d33cb1b1c2cc913499c18dfc7d6959.zip
fix bashisms
- PKI TRAC Ticket #2249 - fix bashisms - changes 'source' to '.' - changes 'bash' to 'sh'
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build_dogtag_pki2
-rwxr-xr-xscripts/compose_dogtag_pki_meta_packages4
-rwxr-xr-xscripts/compose_dogtag_pki_theme_packages8
-rw-r--r--scripts/compose_functions2
-rwxr-xr-xscripts/compose_pki_console_packages8
-rwxr-xr-xscripts/compose_pki_core_packages8
-rwxr-xr-xscripts/compose_pki_test_package2
-rwxr-xr-xscripts/create_beaker_job2
-rwxr-xr-xscripts/create_pki_yum_repos2
-rwxr-xr-xscripts/dev_setup2
-rwxr-xr-xscripts/install_default_ca_instance2
-rwxr-xr-xscripts/install_default_pki_instances2
-rwxr-xr-xscripts/pki_patch_maker2
-rwxr-xr-xscripts/prepare_dogtag_pki2
-rwxr-xr-xscripts/remove_default_pki_instances2
-rwxr-xr-xscripts/remove_pki_components2
16 files changed, 26 insertions, 26 deletions
diff --git a/scripts/build_dogtag_pki b/scripts/build_dogtag_pki
index 653b9f2fe..24015f18a 100755
--- a/scripts/build_dogtag_pki
+++ b/scripts/build_dogtag_pki
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2011 Red Hat, Inc.
# All rights reserved.
diff --git a/scripts/compose_dogtag_pki_meta_packages b/scripts/compose_dogtag_pki_meta_packages
index a70213c79..c19ab0054 100755
--- a/scripts/compose_dogtag_pki_meta_packages
+++ b/scripts/compose_dogtag_pki_meta_packages
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
@@ -9,7 +9,7 @@
##
COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
+. ${COMPOSE_PWD}/compose_functions
## Always switch into the base directory three levels
diff --git a/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages
index 7df834cd0..12c7e6a9f 100755
--- a/scripts/compose_dogtag_pki_theme_packages
+++ b/scripts/compose_dogtag_pki_theme_packages
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
@@ -9,7 +9,7 @@
##
COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
+. ${COMPOSE_PWD}/compose_functions
## Always switch into the base directory three levels
@@ -187,7 +187,7 @@ fi
##
rm -rf ${DOGTAG_PKI_THEME_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n" > ${DOGTAG_PKI_THEME_PACKAGE_SCRIPT}
+printf "#!/bin/sh\n\n" > ${DOGTAG_PKI_THEME_PACKAGE_SCRIPT}
printf "${DOGTAG_PKI_THEME_PACKAGE_COMMAND}\n\n" >> ${DOGTAG_PKI_THEME_PACKAGE_SCRIPT}
chmod 775 ${DOGTAG_PKI_THEME_PACKAGE_SCRIPT}
@@ -197,5 +197,5 @@ chmod 775 ${DOGTAG_PKI_THEME_PACKAGE_SCRIPT}
##
cd ${PKI_PACKAGES} ;
-bash ./package_${DOGTAG_PKI_THEME} | tee package_${DOGTAG_PKI_THEME}.log 2>&1
+sh ./package_${DOGTAG_PKI_THEME} | tee package_${DOGTAG_PKI_THEME}.log 2>&1
diff --git a/scripts/compose_functions b/scripts/compose_functions
index 3e8f2cca2..9b55f880d 100644
--- a/scripts/compose_functions
+++ b/scripts/compose_functions
@@ -298,7 +298,7 @@ Create_repo_after_build()
exit -1
fi
- source $1
+ . $1
### Remove leading and trailing whitespaces ###
repo_location=`echo $REPOSITORY_LOCATION |sed -e 's/^ *//g' -e 's/ *$//g'`
diff --git a/scripts/compose_pki_console_packages b/scripts/compose_pki_console_packages
index bdee121a5..92ffb7fbd 100755
--- a/scripts/compose_pki_console_packages
+++ b/scripts/compose_pki_console_packages
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
@@ -9,7 +9,7 @@
##
COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
+. ${COMPOSE_PWD}/compose_functions
## Always switch into the base directory three levels
@@ -185,7 +185,7 @@ fi
##
rm -rf ${PKI_CONSOLE_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n" > ${PKI_CONSOLE_PACKAGE_SCRIPT}
+printf "#!/bin/sh\n\n" > ${PKI_CONSOLE_PACKAGE_SCRIPT}
printf "${PKI_CONSOLE_PACKAGE_COMMAND}\n\n" >> ${PKI_CONSOLE_PACKAGE_SCRIPT}
chmod 775 ${PKI_CONSOLE_PACKAGE_SCRIPT}
@@ -195,5 +195,5 @@ chmod 775 ${PKI_CONSOLE_PACKAGE_SCRIPT}
##
cd ${PKI_PACKAGES} ;
-bash ./package_${PKI_CONSOLE} | tee package_${PKI_CONSOLE}.log 2>&1
+sh ./package_${PKI_CONSOLE} | tee package_${PKI_CONSOLE}.log 2>&1
diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages
index 21fa5508b..c79004d14 100755
--- a/scripts/compose_pki_core_packages
+++ b/scripts/compose_pki_core_packages
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
@@ -9,7 +9,7 @@
##
COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
+. ${COMPOSE_PWD}/compose_functions
## Always switch into the base directory three levels
## above this shell script prior to executing it so
@@ -202,7 +202,7 @@ fi
##
rm -rf ${PKI_CORE_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n" > ${PKI_CORE_PACKAGE_SCRIPT}
+printf "#!/bin/sh\n\n" > ${PKI_CORE_PACKAGE_SCRIPT}
printf "${PKI_CORE_PACKAGE_COMMAND}\n\n" >> ${PKI_CORE_PACKAGE_SCRIPT}
chmod 775 ${PKI_CORE_PACKAGE_SCRIPT}
@@ -212,7 +212,7 @@ chmod 775 ${PKI_CORE_PACKAGE_SCRIPT}
##
cd ${PKI_PACKAGES} ;
-bash ./package_${PKI_CORE} | tee package_${PKI_CORE}.log 2>&1
+sh ./package_${PKI_CORE} | tee package_${PKI_CORE}.log 2>&1
if [ "$CREATEREPO" == "Y" ] ; then
echo "Creating a repository of the built rpms"
diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package
index 069292017..b62ecf494 100755
--- a/scripts/compose_pki_test_package
+++ b/scripts/compose_pki_test_package
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
diff --git a/scripts/create_beaker_job b/scripts/create_beaker_job
index 5184d4883..f7602dcdd 100755
--- a/scripts/create_beaker_job
+++ b/scripts/create_beaker_job
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
### Exit if there not enough parameters specified.
if [ $# -lt 2 ];
diff --git a/scripts/create_pki_yum_repos b/scripts/create_pki_yum_repos
index 69167f3b7..750c86a5a 100755
--- a/scripts/create_pki_yum_repos
+++ b/scripts/create_pki_yum_repos
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This script may ONLY be run on Linux!
PKI_OS=`uname`
diff --git a/scripts/dev_setup b/scripts/dev_setup
index 7dd12a43f..fa4536d42 100755
--- a/scripts/dev_setup
+++ b/scripts/dev_setup
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2012 Red Hat, Inc.
# All rights reserved.
diff --git a/scripts/install_default_ca_instance b/scripts/install_default_ca_instance
index 7de098018..183ce3dd3 100755
--- a/scripts/install_default_ca_instance
+++ b/scripts/install_default_ca_instance
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
diff --git a/scripts/install_default_pki_instances b/scripts/install_default_pki_instances
index 7c1bc9db3..6b21c69b6 100755
--- a/scripts/install_default_pki_instances
+++ b/scripts/install_default_pki_instances
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2010 Red Hat, Inc.
# All rights reserved.
diff --git a/scripts/pki_patch_maker b/scripts/pki_patch_maker
index 2803d26fb..9cf2fdbd5 100755
--- a/scripts/pki_patch_maker
+++ b/scripts/pki_patch_maker
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
## BEGIN COPYRIGHT BLOCK
## (C) 2011 Red Hat, Inc.
## All rights reserved.
diff --git a/scripts/prepare_dogtag_pki b/scripts/prepare_dogtag_pki
index 0b0f8148e..5854d901a 100755
--- a/scripts/prepare_dogtag_pki
+++ b/scripts/prepare_dogtag_pki
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# BEGIN COPYRIGHT BLOCK
# (C) 2011 Red Hat, Inc.
# All rights reserved.
diff --git a/scripts/remove_default_pki_instances b/scripts/remove_default_pki_instances
index 3ec355f1f..428daf08c 100755
--- a/scripts/remove_default_pki_instances
+++ b/scripts/remove_default_pki_instances
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
## BEGIN COPYRIGHT BLOCK
## (C) 2008 Red Hat, Inc.
## All rights reserved.
diff --git a/scripts/remove_pki_components b/scripts/remove_pki_components
index b673d0ad0..a0ccfc87f 100755
--- a/scripts/remove_pki_components
+++ b/scripts/remove_pki_components
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
## BEGIN COPYRIGHT BLOCK
## (C) 2008 Red Hat, Inc.
## All rights reserved.