ci(docker-build): remove bashisms from /etc/profile.d/python.sh

vpayno · Jan 16, 2024 · f0d04b2 · f0d04b2
1 parent d4d56d6
commit f0d04b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/citools/python/python-setup-install b/.github/citools/python/python-setup-install
@@ -82,20 +82,20 @@ main() {
 
 		export PYENV_ROOT="/usr/local/pyenv"
 
-		if [[ ! \${PATH} =~ \${PYENV_ROOT}/bin ]]; then
+		if echo \${PATH} | grep -q \${PYENV_ROOT}/bin; then
 			export PATH="\${PYENV_ROOT}/bin:\${PATH}"
 		fi
 
 		if command -v pyenv 1>/dev/null 2>&1; then
-			if [[ ! \${PATH} =~ \${PYENV_ROOT}/shims ]]; then
+			if echo \${PATH} | grep -q \${PYENV_ROOT}/shims; then
 				eval "\$(pyenv init --path)"
 			fi
 
-			if [[ -z \${PYENV_SHELL} ]]; then
+			if [ -z \${PYENV_SHELL} ]; then
 				eval "\$(pyenv init -)"
 			fi
 
-			if [[ ! \${PATH} =~ \${PYENV_ROOT}/plugins/pyenv-virtualenv/shims ]]; then
+			if echo \${PATH} | grep -q \${PYENV_ROOT}/plugins/pyenv-virtualenv/shims; then
 				eval "\$(pyenv virtualenv-init -)"
 			fi
 		fi

diff --git a/Dockerfile b/Dockerfile
@@ -30,7 +30,7 @@ RUN bash .github/docker/layer-16.00-exercism-go.sh ci-generic-debian && : 202401
 
 RUN bash .github/docker/layer-17.00-exercism-ruby.sh ci-generic-debian && : 20231103-000
 
-RUN bash .github/docker/layer-18.00-exercism-python.sh ci-generic-debian && : 20231115-000
+RUN bash .github/docker/layer-18.00-exercism-python.sh ci-generic-debian && : 20231116-000
 
 RUN bash .github/docker/layer-25.00-tools-vscode.sh ci-generic-debian && : 20240102-000