From 75ba4a07ef6d42ca2febc742324cfe7e29fa1f3a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sat, 14 Dec 2019 13:34:48 +0100
Subject: [PATCH] STYLE: consistent quoting for 'cd'

---
 applications/Allwmake                                       | 2 +-
 src/Allwmake                                                | 5 +++--
 src/OpenFOAM/expressions/fields/createCode                  | 3 ++-
 src/fileFormats/stl/createCode                              | 2 +-
 src/finiteVolume/expressions/patch/createCode               | 3 ++-
 src/finiteVolume/expressions/volume/createCode              | 3 ++-
 .../chtMultiRegionFoam/solarBeamWithTrees/Allclean          | 6 +++---
 .../chtMultiRegionFoam/solarBeamWithTrees/Allrun            | 5 +++--
 .../chtMultiRegionFoam/solarBeamWithTrees/Allrun-parallel   | 5 +++--
 .../chtMultiRegionFoam/solarBeamWithTrees/Allrun.pre        | 5 +++--
 .../shapeOptimisation/naca0012/drag/primalAdjoint/Allclean  | 4 ++--
 .../shapeOptimisation/naca0012/drag/primalAdjoint/Allrun    | 2 +-
 .../naca0012/lift/opt/constraintProjection/Allclean         | 2 +-
 .../naca0012/lift/opt/constraintProjection/Allrun           | 2 +-
 .../naca0012/moment/primalAdjoint/Allclean                  | 4 ++--
 .../shapeOptimisation/naca0012/moment/primalAdjoint/Allrun  | 2 +-
 wmake/src/createCode                                        | 2 +-
 17 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/applications/Allwmake b/applications/Allwmake
index 0322225438..93499ae1cd 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -12,7 +12,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" 2>/dev/null || {
     exit 1
 }
 
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+. "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 
diff --git a/src/Allwmake b/src/Allwmake
index 094a89ee73..648deae6d7 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Run from OPENFOAM src/ directory only
-cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR/src" 2>/dev/null || {
+cd "${0%/*}" || exit
+wmakeCheckPwd "$WM_PROJECT_DIR/src" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_PROJECT_DIR/src"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
@@ -11,7 +12,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR/src" 2>/dev/null || {
     exit 1
 }
 
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+. "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 
diff --git a/src/OpenFOAM/expressions/fields/createCode b/src/OpenFOAM/expressions/fields/createCode
index d10cc5c5a7..a6d0386590 100755
--- a/src/OpenFOAM/expressions/fields/createCode
+++ b/src/OpenFOAM/expressions/fields/createCode
@@ -1,5 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
+#------------------------------------------------------------------------------
 # Manually create ragel scanner and lemon parser header
 
 prefix=fieldExpr
diff --git a/src/fileFormats/stl/createCode b/src/fileFormats/stl/createCode
index 9bbbed96a3..80a7847b51 100755
--- a/src/fileFormats/stl/createCode
+++ b/src/fileFormats/stl/createCode
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
-
+#------------------------------------------------------------------------------
 # Manually create ragel scanner
 
 "${WM_PROJECT_DIR:?}/wmake/scripts/makeParser" \
diff --git a/src/finiteVolume/expressions/patch/createCode b/src/finiteVolume/expressions/patch/createCode
index 3aab7655b8..659132a003 100755
--- a/src/finiteVolume/expressions/patch/createCode
+++ b/src/finiteVolume/expressions/patch/createCode
@@ -1,5 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
+#------------------------------------------------------------------------------
 # Manually create ragel scanner and lemon parser header
 
 prefix=patchExpr
diff --git a/src/finiteVolume/expressions/volume/createCode b/src/finiteVolume/expressions/volume/createCode
index 30d5e5902c..d5fc2dc1d3 100755
--- a/src/finiteVolume/expressions/volume/createCode
+++ b/src/finiteVolume/expressions/volume/createCode
@@ -1,5 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
+#------------------------------------------------------------------------------
 # Manually create ragel scanner and lemon parser header
 
 prefix=volumeExpr
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allclean
index 28963cad53..e1ecc1dc5b 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allclean
@@ -1,12 +1,12 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
 
 cleanCase0
 
 rm -rf constant/cellToRegion
 rm -rf constant/*/polyMesh  # region meshes
-
 rm -rf constant/triSurface
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun
index 512225721f..99be33f495 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
 
 # Setup case
 ./Allrun.pre
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun-parallel
index c856b1fbc3..71fbc80276 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun-parallel
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun-parallel
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
 
 # Setup case
 ./Allrun.pre
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun.pre
index 89c3e4c9a9..c3bf47fefb 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun.pre
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
 
 runApplication blockMesh
 runApplication topoSet
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/drag/primalAdjoint/Allclean b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/drag/primalAdjoint/Allclean
index a5ae7f6bdd..fa47b140e1 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/drag/primalAdjoint/Allclean
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/drag/primalAdjoint/Allclean
@@ -1,9 +1,9 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                                # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
 cleanCase
-rm 0/dxi* 2> /dev/null
+rm -f 0/dxi*
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/drag/primalAdjoint/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/drag/primalAdjoint/Allrun
index dd240b442b..ceb8904cb3 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/drag/primalAdjoint/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/drag/primalAdjoint/Allrun
@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                                # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/Allclean b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/Allclean
index e8557c2554..426e7ad42e 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/Allclean
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/Allclean
@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                                # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/Allrun
index 0b2935e1a6..b0961695d2 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/lift/opt/constraintProjection/Allrun
@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                                # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/moment/primalAdjoint/Allclean b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/moment/primalAdjoint/Allclean
index a5ae7f6bdd..fa47b140e1 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/moment/primalAdjoint/Allclean
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/moment/primalAdjoint/Allclean
@@ -1,9 +1,9 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                                # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
 cleanCase
-rm 0/dxi* 2> /dev/null
+rm -f 0/dxi*
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/moment/primalAdjoint/Allrun b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/moment/primalAdjoint/Allrun
index dd240b442b..ceb8904cb3 100755
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/moment/primalAdjoint/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/naca0012/moment/primalAdjoint/Allrun
@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                                # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
diff --git a/wmake/src/createCode b/wmake/src/createCode
index 66a4cadb67..b59e934808 100755
--- a/wmake/src/createCode
+++ b/wmake/src/createCode
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
-
+#------------------------------------------------------------------------------
 # Manually create ragel scanner
 
 "${WM_PROJECT_DIR:?}/wmake/scripts/makeParser" \