Merge user-setup.sh in provide-user.sh

.devcontainer/Dockerfile

@@ -14,7 +14,6 @@ ENV DEV_GID ${DEV_USER_UID}
 
 COPY assets/provide-user.sh /docker/
 COPY assets/setup.sh /docker/
-COPY assets/user-setup.sh /docker/
 COPY assets/build-install-openresty.sh /docker/
 
 RUN yum update -y && \
@@ -26,5 +25,4 @@ COPY --chown=$DEV_USER:$DEV_USER assets/build-install-ngx-voms.sh /home/$DEV_USE
 
 USER $DEV_USER
 
-RUN sh /docker/build-install-openresty.sh && \
-    sh /docker/user-setup.sh
\ No newline at end of file
+RUN sh /docker/build-install-openresty.sh
\ No newline at end of file

.devcontainer/assets/provide-user.sh

@@ -53,6 +53,24 @@ EOF
 USER_RC_PATH="/home/${USERNAME}"
 
 echo "${CODESPACES_BASH}" >> "${USER_RC_PATH}/.bashrc"
+
+cat << EOF >> "${USER_RC_PATH}/.bashrc"
+if [ -f "\${HOME}/openresty-env" ]; then
+    . \${HOME}/openresty-env
+fi
+
+if [ -d \${HOME}/bin ]; then
+  PATH=\${HOME}/bin:\${PATH}
+fi
+
+if [ -n "\${PS1}" ]; then
+    echo
+    echo "To build and install openresty with the ngx_http_voms_module run 'build-install-ngx-voms.sh'"
+    echo "'nginx-httpg_no_delegation.patch' is needed in the directory where the user runs the script"
+    echo
+fi
+EOF
+
 chown ${USERNAME}:${USERNAME} "${USER_RC_PATH}/.bashrc"
 
 echo "Done!"

.devcontainer/assets/user-setup.sh

-#!/bin/sh
-
-# Copyright 2018-2022 Istituto Nazionale di Fisica Nucleare
-# SPDX-License-Identifier: EUPL-1.2
-
-set -ex
-
-cat << EOF >> ${HOME}/.bashrc
-if [ -f "\${HOME}/openresty-env" ]; then
-    . \${HOME}/openresty-env
-fi
-
-if [ -d \${HOME}/bin ]; then
-  PATH=\${HOME}/bin:\${PATH}
-fi
-
-if [ -n "\${PS1}" ]; then
-    echo
-    echo "To build and install openresty with the ngx_http_voms_module run 'build-install-ngx-voms.sh'"
-    echo "'nginx-httpg_no_delegation.patch' is needed in the directory where the user runs the script"
-    echo
-fi
-EOF