Skip to content

Commit 82b73ee

Browse files
RANGER-4021:Resolved syntax bugs in kms setup.sh (#753)
(cherry picked from commit 9567d07)
1 parent 668ca88 commit 82b73ee

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

kms/scripts/setup.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ usage() {
3636

3737
log() {
3838
local prefix="$(date +%Y-%m-%d\ %H:%M:%S,%3N) "
39-
echo "${prefix} $@" >> $LOGFILE
40-
echo "${prefix} $@"
39+
echo "${prefix} $*" >> $LOGFILE
40+
echo "${prefix} $*"
4141
}
4242
#eval `grep -v '^XAAUDIT.' ${PROPFILE} | grep -v '^$' | grep -v '^#'`
4343
get_prop(){
@@ -1148,7 +1148,7 @@ EOF
11481148
else
11491149
useringroup=`id ${unix_user}`
11501150
useringrouparr=(${useringroup// / })
1151-
if [[ ${useringrouparr[1]} =~ "(${unix_group})" ]]
1151+
if [[ ${useringrouparr[1]} =~ \(${unix_group}\) ]]
11521152
then
11531153
log "[I] the ${unix_user} user already exists and belongs to group ${unix_group}"
11541154
else
@@ -1289,7 +1289,7 @@ setup_install_files(){
12891289
then
12901290
DB_SSL_PARAM="' -Djavax.net.ssl.trustStore=${javax_net_ssl_trustStore} -Djavax.net.ssl.trustStorePassword=${javax_net_ssl_trustStorePassword} -Djavax.net.ssl.trustStoreType=${javax_net_ssl_trustStore_type} '"
12911291
else
1292-
DB_SSL_PARAM="' -Djavax.net.ssl.keyStore=${javax_net_ssl_keyStore} -Djavax.net.ssl.keyStorePassword=${javax_net_ssl_keyStorePassword} -Djavax.net.ssl.keyStoreType={javax_net_ssl_keyStore_type} -Djavax.net.ssl.trustStore=${javax_net_ssl_trustStore} -Djavax.net.ssl.trustStorePassword=${javax_net_ssl_trustStorePassword} -Djavax.net.ssl.trustStoreType=${javax_net_ssl_trustStore_type} '"
1292+
DB_SSL_PARAM="' -Djavax.net.ssl.keyStore=${javax_net_ssl_keyStore} -Djavax.net.ssl.keyStorePassword=${javax_net_ssl_keyStorePassword} -Djavax.net.ssl.keyStoreType=${javax_net_ssl_keyStore_type} -Djavax.net.ssl.trustStore=${javax_net_ssl_trustStore} -Djavax.net.ssl.trustStorePassword=${javax_net_ssl_trustStorePassword} -Djavax.net.ssl.trustStoreType=${javax_net_ssl_trustStore_type} '"
12931293
fi
12941294
echo "export DB_SSL_PARAM=${DB_SSL_PARAM}" > ${WEBAPP_ROOT}/WEB-INF/classes/conf/ranger-kms-env-dbsslparam.sh
12951295
chmod a+rx ${WEBAPP_ROOT}/WEB-INF/classes/conf/ranger-kms-env-dbsslparam.sh

0 commit comments

Comments
 (0)