*-build-*-wheels.sh: Improve syntax

Author: jcfr

scripts/internal/manylinux-build-module-wheels.sh

@@ -4,7 +4,7 @@ script_dir=$(cd $(dirname $0) || exit 1; pwd)
 source "${script_dir}/manylinux-build-common.sh"
 
 # -----------------------------------------------------------------------
-# ARCH, PYBINARIES variables are set in common script
+# ARCH, PYBINARIES, PYTHON_LIBRARY variables are set in common script
 # -----------------------------------------------------------------------
 
 # Compile wheels re-using standalone project and archive cache
@@ -27,13 +27,13 @@ for PYBIN in "${PYBINARIES[@]}"; do
     fi
     itk_build_dir=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux1_${ARCH}
     ln -fs /ITKPythonPackage/ITK-$(basename $(dirname ${PYBIN}))-manylinux1_${ARCH} $itk_build_dir
-    if [[ ! -d $itk_build_dir ]]; then
+    if [[ ! -d ${itk_build_dir} ]]; then
       echo 'ITK build tree not available!' 1>&2
       exit 1
     fi
     itk_source_dir=/work/standalone-${ARCH}-build/ITK-source
     ln -fs /ITKPythonPackage/standalone-${ARCH}-build/ /work/standalone-${ARCH}-build
-    if [[ ! -d $itk_source_dir ]]; then
+    if [[ ! -d ${itk_source_dir} ]]; then
       echo 'ITK source tree not available!' 1>&2
       exit 1
     fi
@@ -54,6 +54,6 @@ done
 # Since there are no external shared libraries to bundle into the wheels
 # this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
 for whl in dist/*linux_$(uname -p).whl; do
-    auditwheel repair $whl -w /work/dist/
-    rm $whl
+    auditwheel repair ${whl} -w /work/dist/
+    rm ${whl}
 done

scripts/internal/manylinux-build-wheels.sh

@@ -123,8 +123,8 @@ done
 # Since there are no external shared libraries to bundle into the wheels
 # this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
 for whl in dist/*linux_$(uname -p).whl; do
-    auditwheel repair $whl -w /work/dist/
-    rm $whl
+    auditwheel repair ${whl} -w /work/dist/
+    rm ${whl}
 done
 
 # Install packages and test

scripts/macpython-build-module-wheels.sh

@@ -12,16 +12,16 @@ script_dir=$(cd $(dirname $0) || exit 1; pwd)
 source "${script_dir}/macpython-build-common.sh"
 
 # -----------------------------------------------------------------------
-# SCRIPT_DIR, VENVS variables are set in common script
+# SCRIPT_DIR, VENVS, PYTHON_LIBRARY variables are set in common script
 # -----------------------------------------------------------------------
 
 VENV="${VENVS[0]}"
 PYTHON_EXECUTABLE=${VENV}/bin/python
-$PYTHON_EXECUTABLE -m pip install --no-cache cmake
+${PYTHON_EXECUTABLE} -m pip install --no-cache cmake
 # CMAKE_EXECUTABLE=${VENV}/bin/cmake
-$PYTHON_EXECUTABLE -m pip install --no-cache ninja
+${PYTHON_EXECUTABLE} -m pip install --no-cache ninja
 NINJA_EXECUTABLE=${VENV}/bin/ninja
-$PYTHON_EXECUTABLE -m pip install --no-cache delocate
+${PYTHON_EXECUTABLE} -m pip install --no-cache delocate
 DELOCATE_LISTDEPS=${VENV}/bin/delocate-listdeps
 DELOCATE_WHEEL=${VENV}/bin/delocate-wheel
 
@@ -37,12 +37,12 @@ for VENV in "${VENVS[@]}"; do
     echo "PYTHON_LIBRARY:${PYTHON_LIBRARY}"
 
     if [[ -e $PWD/requirements-dev.txt ]]; then
-      $PYTHON_EXECUTABLE -m pip install -r $PWD/requirements-dev.txt
+      ${PYTHON_EXECUTABLE} -m pip install -r $PWD/requirements-dev.txt
     fi
-    $PYTHON_EXECUTABLE -m pip install --no-cache ninja
+    ${PYTHON_EXECUTABLE} -m pip install --no-cache ninja
     NINJA_EXECUTABLE=${VENV}/bin/ninja
     itk_build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
-    $PYTHON_EXECUTABLE setup.py bdist_wheel --build-type MinSizeRel --plat-name macosx-10.6-x86_64 -G Ninja -- \
+    ${PYTHON_EXECUTABLE} setup.py bdist_wheel --build-type MinSizeRel --plat-name macosx-10.6-x86_64 -G Ninja -- \
       -DCMAKE_MAKE_PROGRAM:FILEPATH=${NINJA_EXECUTABLE} \
       -DITK_DIR:PATH=${itk_build_path} \
       -DITK_USE_SYSTEM_SWIG:BOOL=ON \
@@ -55,8 +55,8 @@ for VENV in "${VENVS[@]}"; do
       -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
       -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
     || exit 1
-    $PYTHON_EXECUTABLE setup.py clean
+    ${PYTHON_EXECUTABLE} setup.py clean
 done
 
-$DELOCATE_LISTDEPS $PWD/dist/*.whl # lists library dependencies
-$DELOCATE_WHEEL $PWD/dist/*.whl # copies library dependencies into wheel
+${DELOCATE_LISTDEPS} $PWD/dist/*.whl # lists library dependencies
+${DELOCATE_WHEEL} $PWD/dist/*.whl # copies library dependencies into wheel