Fix quoting issues reported by ShellCheck

Author: GArik

tools/osx-build-cmake.sh

@@ -8,30 +8,29 @@ ARCH=${ARCH:-$(uname -m)}
 ENABLE_CONTRIB=1
 ENABLE_HEADLESS=0
 ENABLE_JAVA=0
-CWD=`pwd`
 REPO=${REPO:-/Users/grigoryserebryakov/Documents/project/python-opencv/repos}
 TMP=${TMP:-/Users/grigoryserebryakov/Documents/project/python-opencv/tmp}
 
 SOURCE=https://github.com/GArik/$NAME.git
 
-if [ ! -d $REPO ]; then
-  mkdir -p $REPO
+if [ ! -d "$REPO" ]; then
+  mkdir -p "$REPO"
 fi
-if [ ! -d $TMP ]; then
-  mkdir -p $TMP
+if [ ! -d "$TMP" ]; then
+  mkdir -p "$TMP"
 fi
 
 # getting source codes
-if [ ! -d $REPO/$NAME ]; then
-  git clone --recurse-submodules $SOURCE $REPO/$NAME
+if [ ! -d "$REPO/$NAME" ]; then
+  git clone --recurse-submodules $SOURCE "$REPO/$NAME"
 else
-  cd $REPO/$NAME
+  cd "$REPO/$NAME"
   git pull --ff-only
   git submodule update --recursive
 fi
 
 
-cd $REPO/$NAME
+cd "$REPO/$NAME"
 
 cd opencv
 
@@ -42,9 +41,9 @@ fi
 cd build
 CMAKE_OPTS=(
   -G "Unix Makefiles"
-  -DPYTHON3_EXECUTABLE=$(python3 $REPO/$NAME/tools/python_path.py bin)
-  -DPYTHON3_INCLUDE_DIR=$(python3 $REPO/$NAME/tools/python_path.py include)
-  -DPYTHON3_LIBRARY=$(python3 $REPO/$NAME/tools/python_path.py lib)
+  -DPYTHON3_EXECUTABLE="$(python3 "$REPO/$NAME/tools/python_path.py" bin)"
+  -DPYTHON3_INCLUDE_DIR="$(python3 "$REPO/$NAME/tools/python_path.py" include)"
+  -DPYTHON3_LIBRARY="$(python3 "$REPO/$NAME/tools/python_path.py" lib)"
   -DBUILD_opencv_python3=ON
   -DBUILD_opencv_python2=OFF
   -DOPENCV_SKIP_PYTHON_LOADER=ON
@@ -139,9 +138,9 @@ CV_MODULES=(
   opencv_stitching
   opencv_gapi
 )
-for m in ${CV_MODULES[@]}; do
-    if make help | grep $m; then
-        time make -j $m
+for m in "${CV_MODULES[@]}"; do
+    if make help | grep "$m"; then
+        time make -j "$m"
     fi
 done
 time make -j
@@ -150,7 +149,8 @@ time make -j
 ccache -s
 
 # Copy compiled python module and 3rd-party stuff to package
-cp -f lib/python3/cv2*.so $REPO/$NAME/cv2
+cp -f lib/python3/cv2*.so "$REPO/$NAME/cv2"
+
 # Copy dependencies
 dep_libs=()
 
@@ -167,12 +167,12 @@ dep_list()
         done
         if [ $found -eq 0 ]; then
             dep_libs+=( "$lib" )
-            dep_list $lib
+            dep_list "$lib"
         fi
     done
 }
 
-dep_list $REPO/$NAME/cv2/cv2*.so
+dep_list "$REPO/$NAME/cv2/"cv2*.so
 
 if [ ! -d "$REPO/$NAME/cv2/.dylibs" ]; then
     mkdir -p "$REPO/$NAME/cv2/.dylibs"
@@ -187,7 +187,7 @@ if [ $ENABLE_HEADLESS -eq 0 ]; then
     if [ ! -d "$REPO/$NAME/cv2/qt/plugins/platforms" ]; then
         mkdir -p "$REPO/$NAME/cv2/qt/plugins/platforms"
     fi
-    cp /usr/local/Cellar/qt/5.15.2/plugins/platforms/libqcocoa.dylib $REPO/$NAME/cv2/qt/plugins/platforms
+    cp /usr/local/Cellar/qt/5.15.2/plugins/platforms/libqcocoa.dylib "$REPO/$NAME/cv2/qt/plugins/platforms"
 
     for lib in "${dep_libs[@]}"; do
         cp -f "$lib" "$REPO/$NAME/cv2/.dylibs"
@@ -196,9 +196,9 @@ fi
 
 cp -f "$REPO/$NAME/opencv/data/haarcascades/"*.xml "$REPO/$NAME/cv2/data"
 # Copy licenses
-cp -f $REPO/$NAME/LICENSE.txt $REPO/$NAME/LICENSE-3RD-PARTY.txt $REPO/$NAME/cv2
+cp -f "$REPO/$NAME/LICENSE.txt" "$REPO/$NAME/LICENSE-3RD-PARTY.txt" "$REPO/$NAME/cv2"
 
-cd $REPO/$NAME
+cd "$REPO/$NAME"
 # FIXME: Is there a way to package wheel without setup.py?
 cp setup.py tools/setup.py.bak
 cat tools/setup.py > setup.py
@@ -215,7 +215,7 @@ if [ ! -d "$TMP/testenv" ]; then
   mkdir -p "$TMP/testenv"
 fi
 rm -rf "$TMP/testenv"/*
-virtualenv -p $(python3 $REPO/$NAME/tools/python_path.py bin) "$TMP/testenv"
+virtualenv -p "$(python3 "$REPO/$NAME/tools/python_path.py" bin)" "$TMP/testenv"
 source "$TMP/testenv/bin/activate"
 pip install numpy==1.17.3
 pip install ./opencv_*python*.whl

tools/osx-build-pip.sh

@@ -11,22 +11,19 @@ REPO=${REPO:-/Users/grigoryserebryakov/Documents/project/python-opencv/repos}
 
 SOURCE=https://github.com/GArik/$NAME.git
 
-if [ ! -d $REPO ]; then
-  mkdir -p $REPO
-fi
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG
+if [ ! -d "$REPO" ]; then
+  mkdir -p "$REPO"
 fi
 
-if [ ! -d $REPO/$NAME ]; then
-  git clone --recurse-submodules $SOURCE $REPO/$NAME
+if [ ! -d "$REPO/$NAME" ]; then
+  git clone --recurse-submodules $SOURCE "$REPO/$NAME"
 else
-  cd $REPO/$NAME
+  cd "$REPO/$NAME"
   git pull --ff-only
   git submodule update --recursive
 fi
 
-cd $REPO/$NAME
+cd "$REPO/$NAME"
 
 # Build source package
 python3 setup.py sdist