From ad1def08c881f7392195e4088cf81e9ebc89dd62 Mon Sep 17 00:00:00 2001
From: Ivan Dyachkov <dev@dyachkov.org>
Date: Wed, 25 Oct 2023 17:15:09 +0200
Subject: [PATCH] chore: consolidate bash commands in ct/run.sh

---
 scripts/ct/run.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/ct/run.sh b/scripts/ct/run.sh
index 5ad289303..ba0bbdda3 100755
--- a/scripts/ct/run.sh
+++ b/scripts/ct/run.sh
@@ -276,14 +276,18 @@ if [ "$STOP" = 'no' ]; then
     set -e
 fi
 
-# rebar, mix and hex cache directory need to be writable by $DOCKER_USER
-docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "mkdir -p /.cache /.hex /.mix && chown $DOCKER_USER /.cache /.hex /.mix"
-# need to initialize .erlang.cookie manually here because / is not writable by $DOCKER_USER
-docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "openssl rand -base64 -hex 16 > /.erlang.cookie && chown $DOCKER_USER /.erlang.cookie && chmod 0400 /.erlang.cookie"
-# the user must exist inside the container for `whoami` to work
-docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "useradd --uid $DOCKER_USER -M -d / emqx" || true
-docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "chown -R $DOCKER_USER /var/lib/secret" || true
-docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c "$INSTALL_ODBC" || true
+if [ "$DOCKER_USER" != "root" ]; then
+    # the user must exist inside the container for `whoami` to work
+    docker exec -i $TTY -u root:root "$ERLANG_CONTAINER" bash -c \
+          "useradd --uid $DOCKER_USER -M -d / emqx && \
+           mkdir -p /.cache /.hex /.mix && \
+           chown $DOCKER_USER /.cache /.hex /.mix && \
+           openssl rand -base64 -hex 16 > /.erlang.cookie && \
+           chown $DOCKER_USER /.erlang.cookie && \
+           chmod 0400 /.erlang.cookie && \
+           chown -R $DOCKER_USER /var/lib/secret && \
+           $INSTALL_ODBC" || true
+fi
 
 if [ "$ONLY_UP" = 'yes' ]; then
     exit 0