Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Enforce checkbashisms tox profile
[oom.git]
/
kubernetes
/
common
/
cassandra
/
resources
/
config
/
docker-entrypoint.sh
diff --git
a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
index
5f23a89
..
4dcebc8
100644
(file)
--- a/
kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
+++ b/
kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
@@
-1,4
+1,4
@@
-#!/bin/
ba
sh
+#!/bin/sh
set -e
set -e
@@
-28,7
+28,7
@@
_ip_address() {
}
# "sed -i", but without "mv" (which doesn't work on a bind-mounted file, for example)
}
# "sed -i", but without "mv" (which doesn't work on a bind-mounted file, for example)
-_sed
-in-
place() {
+_sed
_in_
place() {
local filename="$1"; shift
local tempFile
tempFile="$(mktemp)"
local filename="$1"; shift
local tempFile
tempFile="$(mktemp)"
@@
-57,7
+57,7
@@
if [ "$1" = 'cassandra' ]; then
fi
: ${CASSANDRA_SEEDS:="$CASSANDRA_BROADCAST_ADDRESS"}
fi
: ${CASSANDRA_SEEDS:="$CASSANDRA_BROADCAST_ADDRESS"}
- _sed
-in-
place "$CASSANDRA_CONFIG/cassandra.yaml" \
+ _sed
_in_
place "$CASSANDRA_CONFIG/cassandra.yaml" \
-r 's/(- seeds:).*/\1 "'"$CASSANDRA_SEEDS"'"/'
for yaml in \
-r 's/(- seeds:).*/\1 "'"$CASSANDRA_SEEDS"'"/'
for yaml in \
@@
-71,21
+71,21
@@
if [ "$1" = 'cassandra' ]; then
start_rpc \
authenticator \
; do
start_rpc \
authenticator \
; do
- var="CASSANDRA_$
{yaml^^}
"
+ var="CASSANDRA_$
(echo $yaml | tr '[:lower:]' '[:upper:]')
"
# eval presents no security issue here because of limited possible values of var
eval val=\$$var
if [ "$val" ]; then
# eval presents no security issue here because of limited possible values of var
eval val=\$$var
if [ "$val" ]; then
- _sed
-in-
place "$CASSANDRA_CONFIG/cassandra.yaml" \
+ _sed
_in_
place "$CASSANDRA_CONFIG/cassandra.yaml" \
-r 's/^(# )?('"$yaml"':).*/\2 '"$val"'/'
fi
done
for rackdc in dc rack; do
-r 's/^(# )?('"$yaml"':).*/\2 '"$val"'/'
fi
done
for rackdc in dc rack; do
- var="CASSANDRA_$
{rackdc^^}
"
+ var="CASSANDRA_$
(echo $rackdc | tr '[:lower:]' '[:upper:]')
"
# eval presents no security issue here because of limited possible values of var
eval val=\$$var
if [ "$val" ]; then
# eval presents no security issue here because of limited possible values of var
eval val=\$$var
if [ "$val" ]; then
- _sed
-in-
place "$CASSANDRA_CONFIG/cassandra-rackdc.properties" \
+ _sed
_in_
place "$CASSANDRA_CONFIG/cassandra-rackdc.properties" \
-r 's/^('"$rackdc"'=).*/\1 '"$val"'/'
fi
done
-r 's/^('"$rackdc"'=).*/\1 '"$val"'/'
fi
done