Skip to content

Commit 3de8a5b

Browse files
committed
removed redundant if statements
1 parent caf7ae7 commit 3de8a5b

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

pkg/docker/entrypoint.sh

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
#!/usr/bin/env bash
22

33
# Fixup the passwd file, in case we're on OpenShift
4-
if ! whoami &>/dev/null; then
5-
if [[ $(id -u) != 5050 ]]; then
6-
if [[ -w /etc/passwd ]]; then
7-
echo "${USER_NAME:-pgadminr}:x:$(id -u):0:${USER_NAME:-pgadminr} user:${HOME}:/sbin/nologin" >> /etc/passwd
8-
fi
9-
fi
4+
if ! whoami &>/dev/null && [[ $(id -u) != 5050 && -w /etc/passwd ]]; then
5+
echo "${USER_NAME:-pgadminr}:x:$(id -u):0:${USER_NAME:-pgadminr} user:${HOME}:/sbin/nologin" >> /etc/passwd
106
fi
117

128
# usage: file_env VAR [DEFAULT] ie: file_env 'XYZ_DB_PASSWORD' 'example'
@@ -178,12 +174,10 @@ TIMEOUT=$(cd /pgadmin4 && /venv/bin/python3 -c 'import config; print(config.SESS
178174

179175
if [[ -n $PGADMIN_ENABLE_SOCK ]]; then
180176
BIND_ADDRESS="unix:/run/pgadmin/pgadmin.sock"
177+
elif [[ -n $PGADMIN_ENABLE_TLS ]]; then
178+
BIND_ADDRESS="${PGADMIN_LISTEN_ADDRESS:-[::]}:${PGADMIN_LISTEN_PORT:-443}"
181179
else
182-
if [[ -n $PGADMIN_ENABLE_TLS ]]; then
183-
BIND_ADDRESS="${PGADMIN_LISTEN_ADDRESS:-[::]}:${PGADMIN_LISTEN_PORT:-443}"
184-
else
185-
BIND_ADDRESS="${PGADMIN_LISTEN_ADDRESS:-[::]}:${PGADMIN_LISTEN_PORT:-80}"
186-
fi
180+
BIND_ADDRESS="${PGADMIN_LISTEN_ADDRESS:-[::]}:${PGADMIN_LISTEN_PORT:-80}"
187181
fi
188182

189183
if [[ -n $PGADMIN_ENABLE_TLS ]]; then

0 commit comments

Comments
 (0)