From 256c798bc433bcf7077f773c50b8aefe0833ca68 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Tue, 9 Jun 2020 11:14:28 +0200 Subject: [PATCH] Convert multi line if statement to case Having multi-line if-elif statements is not ideal, case improves readability clarifying the code. Change-Id: I3383584e09763d4ae8eab2f36a93ee399dae8382 --- .../environment.d/50-dib-python-version | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version b/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version index e1c75df8..703987ab 100644 --- a/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version +++ b/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version @@ -1,31 +1,39 @@ # Pick which distros we need to force python2 and which to python3 if [ -z "${DIB_PYTHON_VERSION:-}" ]; then - if [ "$DISTRO_NAME" == "ubuntu" ]; then + case "$DISTRO_NAME" in + ubuntu) if [ "$DIB_RELEASE" == "trusty" ]; then DIB_PYTHON_VERSION=2 fi - elif [ "$DISTRO_NAME" == "debian" ]; then + ;; + debian) DIB_PYTHON_VERSION=2 - elif [ "$DISTRO_NAME" == "fedora" ]; then + ;; + fedora) if [ "$DIB_RELEASE" -le 22 ]; then DIB_PYTHON_VERSION=2 fi - elif [ "$DISTRO_NAME" == "centos7" ]; then + ;; + centos7) DIB_PYTHON_VERSION=2 - elif [ "$DISTRO_NAME" == "rhel7" ]; then + ;; + rhel7) # TODO(nmagnezi): Remove this when the 'rhel7' element gets replaced by 'rhel' DIB_PYTHON_VERSION=2 - elif [[ "$DISTRO_NAME" =~ (rhel|centos) ]]; then - if [[ "${DIB_RELEASE}" == "7" ]]; then + ;; + rhel|centos) + if [ "$DIB_RELEASE" == "7" ]; then DIB_PYTHON_VERSION=2 else DIB_PYTHON_VERSION=3 fi - elif [ "$DISTRO_NAME" == "opensuse" ]; then + ;; + opensuse) if [ "${DIB_RELEASE:0:2}" == "42" ]; then DIB_PYTHON_VERSION=2 fi - fi + ;; + esac fi if [ -z "${DIB_PYTHON_VERSION:-}" ]; then