Cleanup (ShellCheck, whitespace unification)

.github/workflows/python-sonar.yml

@@ -19,18 +19,18 @@ jobs:
 
     - name: Install pipenv
       run: pip3 install pipenv
-      
+
     - name: Install aswfdocker and dev dependencies with pipenv
       run: pipenv install --dev
-      
+
     # python unittests with junit XML report and coverage XML Cobertura report for publishing task
     - name: Run pytest
       run: pipenv run pytest python/aswfdocker --doctest-modules --junitxml=test-pytest-results.xml --cov=. --cov-report=xml
-      
+
     # mypy static type checks with junit XML report
     - name: Run mypy
       run: pipenv run mypy python/aswfdocker --junit-xml=test-mypy-results.xml
-      
+
     # prospector linter checks with xunit XML report
     - name: Run prospector linter
       run: pipenv run prospector -F python/aswfdocker --output-format xunit > test-prospector-results.xml

CONTRIBUTING.md

@@ -94,7 +94,7 @@ Documentation](https://git-scm.com/doc).
 
 ### Docker Basics
 
-You will also need to understand how Docker images are built and how 
+You will also need to understand how Docker images are built and how
 to test them. The `aswfdocker` Python utility wraps many of the complexities
 of the Docker build process and must be installed locally before starting.
 Please read the Python [README.md](python/README.md) file for further instructions.
@@ -156,7 +156,7 @@ aswf-docker-dev@lists.aswf.io mail list.
 
 Contributions should be submitted as Github pull requests. See
 [Creating a pull request](https://help.github.com/articles/creating-a-pull-request/)
-if you're unfamiliar with this concept. 
+if you're unfamiliar with this concept.
 
 The development cycle for a code change should follow this protocol:
 
@@ -248,7 +248,7 @@ tests can be run manually by running `pre-commit run --all-files`.
 
 #### Formatting
 
-[Black](https://black.readthedocs.io/en/stable/) is the automatic formatter of choice 
+[Black](https://black.readthedocs.io/en/stable/) is the automatic formatter of choice
 for aswf-docker and is required to be run before any commit.
 
 #### Naming Conventions

README.md

@@ -111,7 +111,7 @@ aswfdocker build -n aswftesting/ci-package-usd:2019
 ```
 
 ### Images
-Images can be build with recent Docker versions but do not require [buildx](https://docs.docker.com/buildx/working-with-buildx/) 
+Images can be build with recent Docker versions but do not require [buildx](https://docs.docker.com/buildx/working-with-buildx/)
 but it is recommended to speed up large builds.
 
 To build all images (very unlikely to succeed unless run on a very very powerful machine!):

ci-common/Dockerfile

@@ -15,7 +15,6 @@ ARG ASWF_ORG
 ARG CI_COMMON_VERSION
 ARG DTS_VERSION
 
-
 LABEL maintainer="aloys.baillet@gmail.com"
 
 LABEL org.opencontainers.image.name="$ASWF_ORG/base-ci"
@@ -40,6 +39,7 @@ WORKDIR /opt/aswf
 ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64:/opt/rh/httpd24/root/usr/lib64:/opt/rh/devtoolset-${DTS_VERSION}/root/usr/lib64:/opt/rh/devtoolset-${DTS_VERSION}/root/usr/lib:${LD_LIBRARY_PATH} \
     PATH=/opt/rh/rh-git218/root/usr/bin:/usr/local/bin:/opt/rh/devtoolset-${DTS_VERSION}/root/usr/bin:/opt/app-root/src/bin:/opt/rh/devtoolset-${DTS_VERSION}/root/usr/bin/:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin \
     CI_COMMON_VERSION=${CI_COMMON_VERSION} \
+    ASWF_ORG=${ASWF_ORG} \
     DTS_VERSION=${DTS_VERSION} \
     PERL5LIB=/opt/rh/rh-git218/root/usr/share/perl5/vendor_perl \
     MANPATH=/opt/rh/rh-git218/root/usr/share/man
@@ -51,9 +51,6 @@ COPY scripts/common/install_sonar.sh \
 COPY --from=ci-package-clang /. /usr/local/
 COPY --from=ci-package-ninja /. /usr/local/
 
-ENV CI_COMMON_VERSION=${CI_COMMON_VERSION} \
-    ASWF_ORG=${ASWF_ORG}
-
 RUN export DOWNLOADS_DIR=/tmp/downloads && \
     mkdir /tmp/downloads && \
     source /tmp/versions_common.sh && \

packages/Dockerfile

@@ -69,7 +69,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-clang ####################
-# This build target is used to generate a packages of clang that 
+# This build target is used to generate a packages of clang that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-clang
@@ -96,7 +96,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-ninja ####################
-# This build target is used to generate a packages of ninja that 
+# This build target is used to generate a packages of ninja that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-ninja
@@ -140,7 +140,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-boost ####################
-# This build target is used to generate a packages of boost that 
+# This build target is used to generate a packages of boost that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-python
@@ -167,7 +167,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-boost ####################
-# This build target is used to generate a packages of boost that 
+# This build target is used to generate a packages of boost that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-boost
@@ -191,7 +191,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-tbb ####################
-# This build target is used to generate a packages of tbb that 
+# This build target is used to generate a packages of tbb that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-tbb
@@ -215,7 +215,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-cppunit ####################
-# This build target is used to generate a packages of cppunit that 
+# This build target is used to generate a packages of cppunit that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-cppunit
@@ -239,7 +239,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-log4cplus ####################
-# This build target is used to generate a packages of log4cplus that 
+# This build target is used to generate a packages of log4cplus that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-log4cplus
@@ -263,7 +263,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-glew ####################
-# This build target is used to generate a packages of glew that 
+# This build target is used to generate a packages of glew that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-glew
@@ -288,7 +288,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-glfw ####################
-# This build target is used to generate a packages of glfw that 
+# This build target is used to generate a packages of glfw that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-glfw
@@ -312,7 +312,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-qt ####################
-# This build target is used to generate a packages of qt that 
+# This build target is used to generate a packages of qt that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-qt
@@ -341,7 +341,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-pyside ####################
-# This build target is used to generate a packages of pyside that 
+# This build target is used to generate a packages of pyside that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-pyside
@@ -370,7 +370,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-openexr ####################
-# This build target is used to generate a packages of openexr that 
+# This build target is used to generate a packages of openexr that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-openexr
@@ -395,7 +395,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-blosc ####################
-# This build target is used to generate a packages of blosc that 
+# This build target is used to generate a packages of blosc that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-blosc
@@ -420,7 +420,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-partio ####################
-# This build target is used to generate a packages of partio that 
+# This build target is used to generate a packages of partio that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-partio
@@ -444,7 +444,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-oiio ####################
-# This build target is used to generate a packages of oiio that 
+# This build target is used to generate a packages of oiio that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-oiio
@@ -468,7 +468,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-ocio ####################
-# This build target is used to generate a packages of ocio that 
+# This build target is used to generate a packages of ocio that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-ocio
@@ -496,7 +496,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-osl ####################
-# This build target is used to generate a packages of osl that 
+# This build target is used to generate a packages of osl that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-osl
@@ -520,7 +520,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-alembic ####################
-# This build target is used to generate a packages of alembic that 
+# This build target is used to generate a packages of alembic that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-alembic
@@ -545,7 +545,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-ptex ####################
-# This build target is used to generate a packages of ptex that 
+# This build target is used to generate a packages of ptex that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-ptex
@@ -575,7 +575,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-opensubdiv ####################
-# This build target is used to generate a packages of opensubdiv that 
+# This build target is used to generate a packages of opensubdiv that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-opensubdiv
@@ -607,7 +607,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-openvdb ####################
-# This build target is used to generate a packages of openvdb that 
+# This build target is used to generate a packages of openvdb that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-openvdb
@@ -641,7 +641,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-usd ####################
-# This build target is used to generate a packages of usd that 
+# This build target is used to generate a packages of usd that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-usd
@@ -671,7 +671,7 @@ RUN --mount=type=cache,target=/tmp/ccache \
 
 
 #################### ci-package-otio ####################
-# This build target is used to generate a package of otio that 
+# This build target is used to generate a package of otio that
 # can be placed in a downloadable artifact
 
 FROM scratch as ci-package-otio

scripts/base/build_boost.sh

@@ -27,13 +27,13 @@ fi
 mkdir boost
 cd boost
 
-if [ ! -f $DOWNLOADS_DIR/boost-${BOOST_VERSION}.tar.gz ]; then
-    curl --location https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_U}.tar.gz -o $DOWNLOADS_DIR/boost-${BOOST_VERSION}.tar.gz
+if [ ! -f "$DOWNLOADS_DIR/boost-${BOOST_VERSION}.tar.gz" ]; then
+    curl --location "https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_U}.tar.gz" -o "$DOWNLOADS_DIR/boost-${BOOST_VERSION}.tar.gz"
 fi
 
-tar -xzf $DOWNLOADS_DIR/boost-${BOOST_VERSION}.tar.gz
+tar -xzf "$DOWNLOADS_DIR/boost-${BOOST_VERSION}.tar.gz"
 
-cd boost_${BOOST_VERSION_U}
+cd "boost_${BOOST_VERSION_U}"
 sh bootstrap.sh ${BOOTSTRAP_ARGS}
 ./b2 install -j2 variant=release toolset=gcc link=shared \
     --with-atomic \
@@ -61,7 +61,7 @@ sh bootstrap.sh ${BOOTSTRAP_ARGS}
     --with-timer \
     --with-type_erasure \
     --with-wave \
-    --prefix=${ASWF_INSTALL_PREFIX} \
+    --prefix="${ASWF_INSTALL_PREFIX}" \
     --with-python \
     ${BOOST_EXTRA_ARGS}
 

scripts/base/build_cppunit.sh

@@ -4,16 +4,16 @@
 
 set -ex
 
-if [ ! -f $DOWNLOADS_DIR/cppunit-${CPPUNIT_VERSION}.tar.gz ]; then
-    curl --location http://dev-www.libreoffice.org/src/cppunit-${CPPUNIT_VERSION}.tar.gz -o $DOWNLOADS_DIR/cppunit-${CPPUNIT_VERSION}.tar.gz
+if [ ! -f "$DOWNLOADS_DIR/cppunit-${CPPUNIT_VERSION}.tar.gz" ]; then
+    curl --location "http://dev-www.libreoffice.org/src/cppunit-${CPPUNIT_VERSION}.tar.gz" -o "$DOWNLOADS_DIR/cppunit-${CPPUNIT_VERSION}.tar.gz"
 fi
 
-tar xf $DOWNLOADS_DIR/cppunit-${CPPUNIT_VERSION}.tar.gz
-cd cppunit-${CPPUNIT_VERSION}
+tar xf "$DOWNLOADS_DIR/cppunit-${CPPUNIT_VERSION}.tar.gz"
+cd "cppunit-${CPPUNIT_VERSION}"
 
-./configure --prefix=${ASWF_INSTALL_PREFIX}
+./configure --prefix="${ASWF_INSTALL_PREFIX}"
 make -j$(nproc)
 make install
 
 cd ..
-rm -rf cppunit-${CPPUNIT_VERSION}
+rm -rf "cppunit-${CPPUNIT_VERSION}"

scripts/base/build_glew.sh

@@ -4,16 +4,16 @@
 
 set -ex
 
-if [ ! -f $DOWNLOADS_DIR/glew-${GLEW_VERSION}.tgz ]; then
-    curl --location https://github.com/nigels-com/glew/releases/download/glew-${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz -o $DOWNLOADS_DIR/glew-${GLEW_VERSION}.tgz
+if [ ! -f "$DOWNLOADS_DIR/glew-${GLEW_VERSION}.tgz" ]; then
+    curl --location "https://github.com/nigels-com/glew/releases/download/glew-${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz" -o "$DOWNLOADS_DIR/glew-${GLEW_VERSION}.tgz"
 fi
 
-tar xf $DOWNLOADS_DIR/glew-${GLEW_VERSION}.tgz
+tar xf "$DOWNLOADS_DIR/glew-${GLEW_VERSION}.tgz"
 
-cd glew-${GLEW_VERSION}/build
-cmake ./cmake -DCMAKE_INSTALL_PREFIX=${ASWF_INSTALL_PREFIX}
+cd "glew-${GLEW_VERSION}/build"
+cmake ./cmake -DCMAKE_INSTALL_PREFIX="${ASWF_INSTALL_PREFIX}"
 make -j$(nproc)
 make install
 
 cd ../..
-rm -rf glew-${GLEW_VERSION}
+rm -rf "glew-${GLEW_VERSION}"

scripts/base/build_glfw.sh

@@ -8,13 +8,13 @@ git clone https://github.com/glfw/glfw.git
 cd glfw
 
 if [ "$GLFW_VERSION" != "latest" ]; then
-    git checkout tags/${GLFW_VERSION} -b ${GLFW_VERSION}
+    git checkout "tags/${GLFW_VERSION}" -b "${GLFW_VERSION}"
 fi
 
 mkdir build
 cd build
 
-cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${ASWF_INSTALL_PREFIX} ..
+cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${ASWF_INSTALL_PREFIX}" ..
 make -j$(nproc)
 make install
 

scripts/base/build_log4cplus.sh

@@ -13,12 +13,12 @@ git clone https://github.com/log4cplus/log4cplus.git
 cd log4cplus
 
 if [ "$LOG4CPLUS_VERSION" != "latest" ]; then
-    git checkout tags/REL_${LOG4CPLUS_MAJOR}_${LOG4CPLUS_MINOR}_${LOG4CPLUS_PATCH} -b ${LOG4CPLUS_VERSION}
+    git checkout "tags/REL_${LOG4CPLUS_MAJOR}_${LOG4CPLUS_MINOR}_${LOG4CPLUS_PATCH}" -b "${LOG4CPLUS_VERSION}"
 fi
 
 mkdir build
 cd build
-cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${ASWF_INSTALL_PREFIX} ..
+cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="${ASWF_INSTALL_PREFIX}" ..
 make -j$(nproc)
 make install