STYLE: remove unnecessary stdout, stderr /dev/null redirects

- no stderr redirect needed:
    * 'command -v'

- no stdout/stderr redirect needed:
    * 'rm -f'

STYLE: consistent spacing after redirects

applications/utilities/miscellaneous/OSspecific/addr2line/addr2line.C

@@ -186,7 +186,7 @@ std::string getLine(const std::string& filename, const std::string& addr)
           + "' -o '"
           + "target module load -f "
           + filename
-          + " __TEXT 0x0' 2> /dev/null"
+          + " __TEXT 0x0' 2>/dev/null"
           + " | grep LineEntry"
         );
 

bin/foamCreateVideo

@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2015-2016 OpenFOAM Foundation
-#     Copyright (C) 2018 OpenCFD Ltd.
+#     Copyright (C) 2018-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
@@ -138,7 +138,7 @@ do
     -webm)
         # webm - needs avconv
         outputFormat=webm
-        command -v avconv >/dev/null 2>&1 || \
+        command -v avconv >/dev/null || \
             die "webm format requires avconv, which was not found."
         ;;
     -*)
@@ -168,7 +168,7 @@ echo
 
 if [ "$outputFormat" = webm ]
 then
-    if command -v avconv >/dev/null 2>&1
+    if command -v avconv >/dev/null
     then
         echo "Creating video with avconv..."
         avconv \
@@ -180,7 +180,7 @@ then
         die "webm format requires avconv, which was not found."
     fi
 else
-    if command -v avconv >/dev/null 2>&1
+    if command -v avconv >/dev/null
     then
         echo "Creating video with avconv..."
         avconv \
@@ -189,7 +189,7 @@ else
             -c:v libx264 -pix_fmt yuv420p \
             "$outputPrefix.$outputFormat"
 
-    elif command -v mencoder >/dev/null 2>&1
+    elif command -v mencoder >/dev/null
     then
         echo "Creating video with mencoder..."
         mencoder \

bin/foamInstallationTest

@@ -241,7 +241,7 @@ reportExecutable()
             | sed -ne 's/flex \([0-9][0-9.]*\).*/\1/p')
         ;;
     wmake)
-        VERSION="$(wmake -show-api 2> /dev/null)"
+        VERSION="$(wmake -show-api 2>/dev/null)"
         ;;
     *gcc* | *g++*)
         VERSION=$($APP_NAME -v 2>&1 \

bin/foamLog

@@ -296,7 +296,7 @@ say
 # Generate Awk program
 #-----------------------------
 
-rm -f $AWKFILE 2> /dev/null
+rm -f $AWKFILE
 cat << AWK_CONTENTS > $AWKFILE
 # Awk script for OpenFOAM log file extraction
 BEGIN {

bin/paraFoam

@@ -226,7 +226,7 @@ proc*)
     for i in processor*
     do
     (
-        cd "$i" 2> /dev/null && touch "${caseFile%.*}#${i#processor}.$extension"
+        cd "$i" 2>/dev/null && touch "${caseFile%.*}#${i#processor}.$extension"
     )
     done
     echo "Created '$caseFile' for processor directories" 1>&2

bin/tools/CleanFunctions

@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2015-2018 OpenCFD Ltd.
+#     Copyright (C) 2015-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -27,14 +27,14 @@ cleanTimeDirectories()
     while [ ${#zeros} -lt 8 ]
     do
         timeDir="0.${zeros}[1-9]*"
-        rm -rf ./${timeDir} ./-${timeDir} > /dev/null 2>&1
+        rm -rf ./${timeDir} ./-${timeDir}
         zeros="0$zeros"
     done
     rm -rf \
         ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* \
         ./.fxLock ./*.xml ./ParaView* ./paraFoam* \
         ./*.blockMesh ./*.foam ./*.OpenFOAM \
-        ./.setSet > /dev/null 2>&1
+        ./.setSet
 }
 
 
@@ -42,7 +42,7 @@ cleanAdiosOutput()
 {
     if [ -d adiosData ] && [ -d system ]
     then
-        rm -rf adiosData > /dev/null 2>&1
+        rm -rf adiosData
     fi
 }
 
@@ -51,7 +51,7 @@ cleanDynamicCode()
 {
     if [ -d dynamicCode ] && [ -d system ]
     then
-        rm -rf dynamicCode > /dev/null 2>&1
+        rm -rf dynamicCode
     fi
 }
 
@@ -63,23 +63,23 @@ cleanSnappyFiles()
         constant/polyMesh/pointLevel \
         constant/polyMesh/refinementHistory \
         constant/polyMesh/level0Edge \
-        constant/polyMesh/surfaceIndex > /dev/null 2>&1
+        constant/polyMesh/surfaceIndex
     rm -f \
         processor*/constant/polyMesh/cellLevel \
         processor*/constant/polyMesh/pointLevel \
         processor*/constant/polyMesh/refinementHistory \
         processor*/constant/polyMesh/level0Edge \
-        processor*/constant/polyMesh/surfaceIndex > /dev/null 2>&1
+        processor*/constant/polyMesh/surfaceIndex
     rm -f \
         constant/cellLevel \
         constant/pointLevel \
         0/cellLevel \
-        0/pointLevel > /dev/null 2>&1
+        0/pointLevel
     rm -f \
         processor*/constant/cellLevel \
         processor*/constant/pointLevel \
         processor*/0/cellLevel \
-        processor*/0/pointLevel > /dev/null 2>&1
+        processor*/0/pointLevel
 }
 
 
@@ -92,11 +92,11 @@ cleanOptimisation()
 
 cleanPostProcessing()
 {
-    rm -rf Ensight EnSight ensightWrite insitu VTK > /dev/null 2>&1
+    rm -rf Ensight EnSight ensightWrite insitu VTK
-    rm -rf postProcessing > /dev/null 2>&1
+    rm -rf postProcessing
-    rm -rf postProcessing-dry-run > /dev/null 2>&1
+    rm -rf postProcessing-*
-    rm -rf cuttingPlane > /dev/null 2>&1
+    rm -rf cuttingPlane
-    rm -rf surfaceSampling > /dev/null 2>&1
+    rm -rf surfaceSampling
 }
 
 
@@ -108,19 +108,19 @@ cleanCase()
     cleanDynamicCode
     cleanOptimisation
 
-    rm -rf processor* > /dev/null 2>&1
+    rm -rf processor*
-    rm -rf TDAC > /dev/null 2>&1
+    rm -rf TDAC
-    rm -rf probes* > /dev/null 2>&1
+    rm -rf probes*
-    rm -rf forces* > /dev/null 2>&1
+    rm -rf forces*
-    rm -rf graphs* > /dev/null 2>&1
+    rm -rf graphs*
-    rm -rf sets > /dev/null 2>&1
+    rm -rf sets
-    rm -rf system/machines > /dev/null 2>&1
+    rm -rf system/machines
 
     # From mpirunDebug
     rm -f gdbCommands  mpirun.schema
 
     cleanSnappyFiles
-    rm -f 0/cellDist > /dev/null 2>&1
+    rm -f 0/cellDist
 
     (
         cd constant 2>/dev/null || exit 0
@@ -128,13 +128,13 @@ cleanCase()
         rm -rf \
           cellDecomposition cellToRegion cellLevel* pointLevel* \
           tetDualMesh \
-          > /dev/null 2>&1
+          ;
 
         # Old constant/polyMesh location for blockMeshDict still in use?
         # - emit a gentle warning
         if [ -e polyMesh/blockMeshDict.m4 ]
         then
-            rm -f polyMesh/blockMeshDict > /dev/null 2>&1
+            rm -f polyMesh/blockMeshDict
             echo
             echo "Warning: not removing constant/polyMesh/ "
             echo "   it contains a blockMeshDict, which should normally be under system/ instead"
@@ -147,13 +147,13 @@ cleanCase()
             echo
         else
             # Remove polyMesh entirely if there is no blockMeshDict
-            rm -rf polyMesh > /dev/null 2>&1
+            rm -rf polyMesh
         fi
     )
 
     if [ -e system/blockMeshDict.m4 ]
     then
-        rm -f system/blockMeshDict > /dev/null 2>&1
+        rm -f system/blockMeshDict
     fi
 }
 
@@ -175,24 +175,22 @@ removeCase()
 
 cleanSamples()
 {
-    rm -rf sets samples sampleSurfaces > /dev/null 2>&1
+    rm -rf sets samples sampleSurfaces
 }
 
 
 cleanUcomponents()
 {
-    rm -rf 0/Ux 0/Uy 0/Uz > /dev/null 2>&1
+    rm -rf 0/Ux 0/Uy 0/Uz
 }
 
 
 cleanFaMesh ()
 {
-    (
+    rm -rf \
-        cd constant/faMesh 2>/dev/null && \
+        constant/faMesh/faceLabels* \
-        rm -rf \
+        constant/faMesh/faBoundary* \
-          faceLabels* faBoundary* \
+    ;
-          > /dev/null 2>&1 \
-    )
 }
 
 

bin/tools/LogFunctions

@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2017 OpenCFD Ltd.
+#     Copyright (C) 2017-2019 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -73,7 +73,7 @@ logReport()
 collectLogs()
 {
     echo "Collecting log files..." 1>&2
-    rm -f logs testLoopReport > /dev/null 2>&1
+    rm -f logs testLoopReport
     touch logs testLoopReport
 
     local appDir log logFiles
@@ -115,7 +115,7 @@ removeLogs()
         -name '*.pvs' -o -name '*.foam' -o -name '*.OpenFOAM' \
         \) -type f -delete
 
-    rm -f logs testLoopReport > /dev/null 2>&1
+    rm -f logs testLoopReport
 }
 
 

bin/tools/RunFunctions

@@ -434,7 +434,7 @@ restore0Dir()
         (
             echo "Filter #include directives in processors/0:"
             \cd processors/0 2>/dev/null || exit 0
-            for file in $(grep -l "#include" * 2> /dev/null)
+            for file in $(grep -l "#include" * 2>/dev/null)
             do
                 foamDictionary "$file" > "$file.$$." && mv "$file.$$." "$file"
                 echo "    $file"

bin/tools/foamCreateCompletionCache

@@ -204,7 +204,7 @@ do
         do
             extractOptions $appName
         done
-    elif command -v "$item" > /dev/null 2>&1
+    elif command -v "$item" >/dev/null
     then
         extractOptions $item
     else

bin/tools/foamCreateManpage

@@ -128,7 +128,7 @@ then
     [ -d "$outputDir" ] && [ -w "$outputDir" ] || \
         die "Cannot write to $outputDir" "Not a directory, or no permission?"
 else
-    mkdir -p "$outputDir" 2> /dev/null || \
+    mkdir -p "$outputDir" 2>/dev/null || \
         die "Cannot create directory: $outputDir"
 fi
 
@@ -138,7 +138,7 @@ echo 1>&2
 # Use a tmp file so that we confirm that the content was
 # generated and looks somewhat like a manpage (has a SYNOPSIS)
 tmpFile="$outputDir/${0##*/}-tmp$$"
-trap "rm -fv $tmpFile >/dev/null; exit 0" EXIT TERM INT
+trap "rm -fv $tmpFile 2>/dev/null; exit 0" EXIT TERM INT
 
 
 # Any special filter requirements?
@@ -148,12 +148,12 @@ outputExt="1"
 case "$outputType" in
     pdf)
         outputExt="pdf"
-        command -v groff  > /dev/null || die "Missing program: groff"
+        command -v groff  >/dev/null || die "Missing program: groff"
-        command -v ps2pdf > /dev/null || die "Missing program: ps2pdf"
+        command -v ps2pdf >/dev/null || die "Missing program: ps2pdf"
         ;;
     gz)
         outputExt="1.gz"
-        command -v gzip   > /dev/null || die "Missing program: gzip"
+        command -v gzip   >/dev/null || die "Missing program: gzip"
     ;;
 esac
 
@@ -212,7 +212,7 @@ do
         do
             process $appName
         done
-    elif command -v "$item" > /dev/null 2>&1
+    elif command -v "$item" >/dev/null
     then
         process $item
     else

doc/Doxygen/Allwmake

@@ -113,8 +113,8 @@ done
 rm -rf latex man
 
 # Remove html directory in background
-mv html html-stagedRemove$$ 2> /dev/null
+mv html html-stagedRemove$$ 2>/dev/null
-rm -rf html-stagedRemove$$ >/dev/null 2>&1 &
+rm -rf html-stagedRemove$$ 2>/dev/null &
 
 # Ensure that created files are readable by everyone
 umask 22

etc/config.sh/CGAL

@@ -58,7 +58,7 @@ then
     echo "Using CGAL ($cgal_version)  ->  $CGAL_ARCH_PATH" 1>&2
 fi
 
-if command -v _foamAddLibAuto > /dev/null 2>&1  # Normal sourcing (not makeCGAL)
+if command -v _foamAddLibAuto >/dev/null  # Normal sourcing (not makeCGAL)
 then
     _foamAddLibAuto $BOOST_ARCH_PATH  lib$WM_COMPILER_LIB_ARCH
     _foamAddLibAuto $CGAL_ARCH_PATH   lib$WM_COMPILER_LIB_ARCH

etc/config.sh/FFTW

@@ -45,7 +45,7 @@ then
     echo "Using fftw ($fftw_version)  ->  $FFTW_ARCH_PATH" 1>&2
 fi
 
-if command -v _foamAddLibAuto > /dev/null 2>&1  # Normal sourcing (not makeFFTW)
+if command -v _foamAddLibAuto >/dev/null  # Normal sourcing (not makeFFTW)
 then
 
     _foamAddLibAuto $FFTW_ARCH_PATH  lib$WM_COMPILER_LIB_ARCH

etc/config.sh/adios2

@@ -32,7 +32,7 @@ then
     echo "Using adios ($adios2_version)  ->  $ADIOS2_ARCH_PATH" 1>&2
 fi
 
-if command -v _foamAddLibAuto > /dev/null 2>&1
+if command -v _foamAddLibAuto >/dev/null
 then
     # Normal sourcing (not makeAdios2)
     # Only add to PATH if the directory really exists

etc/config.sh/bash_completion

@@ -78,7 +78,7 @@ foamAddCompletion()
                 # echo "complete ${appName##*/}" 1>&2
             done
 
-        elif command -v "$appName" > /dev/null 2>&1
+        elif command -v "$appName" >/dev/null
         then
             complete -o filenames -F _of_complete_ "${appName##*/}"
             # echo "complete ${appName##*/}" 1>&2

etc/config.sh/gperftools

@@ -48,7 +48,7 @@ then
     echo "Using gperftools ($gperftools_version)  ->  $GPERFTOOLS_ARCH_PATH" 1>&2
 fi
 
-if command -v _foamAddLib > /dev/null 2>&1      # Normal sourcing
+if command -v _foamAddLib >/dev/null  # Normal sourcing
 then
 
     # If GPERFTOOLS_ARCH_PATH does not end with '-system' or '-none',

etc/config.sh/hypre

@@ -38,9 +38,9 @@ then
     echo "Using hypre ($hypre_version)  ->  $HYPRE_ARCH_PATH" 1>&2
 fi
 
-if command -v _foamAddLibAuto > /dev/null 2>&1  # Normal sourcing (not makeHYPRE)
+if command -v _foamAddLibAuto >/dev/null
 then
-
+    # Normal sourcing (not makeHYPRE)
     _foamAddLibAuto $HYPRE_ARCH_PATH
 
     unset hypre_version

etc/config.sh/mpi

@@ -82,7 +82,7 @@ OPENMPI)
     fi
 
     # Could be sourced from ThirdParty with incomplete environment
-    if command -v _foamAddLibAuto > /dev/null 2>&1  # Normal sourcing
+    if command -v _foamAddLibAuto >/dev/null  # Normal sourcing
     then
         _foamAddPath    $MPI_ARCH_PATH/bin
         _foamAddMan     $MPI_ARCH_PATH/share/man
@@ -151,7 +151,7 @@ MPICH)
     export MPI_HOME=$MPI_ARCH_PATH
 
     # Could be sourced from ThirdParty with incomplete environment
-    if command -v _foamAddLibAuto > /dev/null 2>&1  # Normal sourcing
+    if command -v _foamAddLibAuto >/dev/null  # Normal sourcing
     then
         _foamAddPath    $MPI_ARCH_PATH/bin
         _foamAddMan     $MPI_ARCH_PATH/share/man
@@ -175,7 +175,7 @@ MVA2MPI)  # MVAMPICH2
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
     # Could be sourced from ThirdParty with incomplete environment
-    if command -v _foamAddLibAuto > /dev/null 2>&1  # Normal sourcing
+    if command -v _foamAddLibAuto >/dev/null  # Normal sourcing
     then
         _foamAddPath    $MPI_ARCH_PATH/bin
         _foamAddMan     $MPI_ARCH_PATH/share/man
@@ -341,7 +341,7 @@ esac
 
 # Add (non-dummy) MPI implementation
 # - dummy MPI already in lib-path and has no external libraries
-if [ "$FOAM_MPI" != dummy ] && type _foamAddLib > /dev/null 2>&1
+if [ "$FOAM_MPI" != dummy ] && command -v _foamAddLib >/dev/null
 then
     if [ -n "$FOAM_EXT_LIBBIN" ]    # External libraries (allowed to be unset)
     then

etc/config.sh/paraview

@@ -201,7 +201,7 @@ esac
 
 #------------------------------------------------------------------------------
 
-if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
+if command -v _foamAddLib >/dev/null  # normal sourcing
 then
     unset ParaView_VERSION ParaView_QT
 fi

etc/config.sh/paraview-system

@@ -85,7 +85,7 @@ fi
 
 #------------------------------------------------------------------------------
 
-if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
+if command -v _foamAddLib >/dev/null  # normal sourcing
 then
     unset ParaView_VERSION
 else

etc/config.sh/petsc

@@ -38,7 +38,7 @@ then
     echo "Using petsc ($petsc_version)  ->  $PETSC_ARCH_PATH" 1>&2
 fi
 
-if command -v _foamAddLibAuto > /dev/null 2>&1
+if command -v _foamAddLibAuto >/dev/null
 then
     # Normal sourcing (not makePETSC)
 

etc/config.sh/vtk

@@ -51,7 +51,7 @@ then
     echo "    llvm ($mesa_llvm) $LLVM_ARCH_PATH" 1>&2
 fi
 
-if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
+if command -v _foamAddLib >/dev/null  # normal sourcing
 then
 
     # Set paths if binaries are present

src/functionObjects/graphics/runTimePostProcessing/Allwclean

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 # This cleanup handles both cmake runTimePostProcessing and the dummy version
 
 # Cleanup library files with .so version endings
-rm -f $FOAM_LIBBIN/librunTimePostProcessing* 2>/dev/null
+rm -f $FOAM_LIBBIN/librunTimePostProcessing*
 
 # Cleanup generated files - remove entire top-level
 removeObjectDir "$PWD"

src/functionObjects/graphics/runTimePostProcessing/Allwmake

@@ -27,7 +27,7 @@ then
     depend=ignore
 elif [ -n "$depend" ]
 then
-    if command -v cmake > /dev/null 2>&1
+    if command -v cmake >/dev/null
     then
         cmakeVersioned "$depend" $PWD || {
             echo

tutorials/IO/dictionary/Allclean

@@ -1,6 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+#------------------------------------------------------------------------------
 
-rm log.* 2>/dev/null                        # No application, clean manually
+rm -f log.*                                 # No application, clean manually
 
 #------------------------------------------------------------------------------

tutorials/basic/laplacianFoam/flange/Allclean

@@ -4,6 +4,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 cleanCase
-rm -rf Fieldview > /dev/null 2>&1
+rm -rf Fieldview
 
 #------------------------------------------------------------------------------

tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun

@@ -11,7 +11,7 @@ runApplication decomposePar -force
 
 runParallel potentialFoam -pName pPotential -initialiseUBCs
 
-\rm -f processor*/0/phi
+rm -f processor*/0/phi
 
 runParallel XiDyMFoam
 

tutorials/combustion/XiEngineFoam/kivaTest/Allclean

@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1                                # Run from this directory
 mv ./-180 temp180
 cleanCase
 
-rm -rf 0 > /dev/null 2>&1
+rm -rf 0
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
+rm -f constant/polyMesh/boundary
 
 mv temp180 ./-180
 

tutorials/combustion/chemFoam/gri/validation/createGraph

@@ -1,6 +1,7 @@
 #!/bin/sh
 
-command -v gnuplot >/dev/null 2>&1 || {
+# Require gnuplot
+command -v gnuplot >/dev/null || {
     echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }
@@ -21,4 +22,3 @@ gnuplot<<EOF
 EOF
 
 #------------------------------------------------------------------------------
-

tutorials/combustion/chemFoam/h2/validation/createGraph

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }
@@ -22,4 +22,3 @@ gnuplot<<EOF
 EOF
 
 #------------------------------------------------------------------------------
-

tutorials/combustion/chemFoam/ic8h18/validation/createGraph

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }
@@ -22,4 +22,3 @@ gnuplot<<EOF
 EOF
 
 #------------------------------------------------------------------------------
-

tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }

tutorials/combustion/chemFoam/nc7h16/validation/createGraph

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }
@@ -22,4 +22,3 @@ gnuplot<<EOF
 EOF
 
 #------------------------------------------------------------------------------
-

tutorials/combustion/fireFoam/LES/compartmentFire/validation/createGraphs

@@ -55,8 +55,8 @@ EOF
 }
 
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }

tutorials/combustion/reactingFoam/RAS/membrane/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm constant/triSurface/membrane-*.stl.gz 2> /dev/null
+rm -f constant/triSurface/membrane-*.stl.gz
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-rm constant/geometry/boundaryLayer.obj > /dev/null 2>&1
+rm -f constant/geometry/boundaryLayer.obj
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allclean

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm externalCoupled.control 2> /dev/null
+rm -f externalCoupled.control
 
 rm -rf comms
 ### rm -rf VTK

tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/Allrun

@@ -22,7 +22,7 @@ then
     # ## Can verify parallel operation of createExternalCoupledPatchGeometry
     if [ "$coupling" = true ] && [ "$testCreate" = true ]
     then
-        \rm -f log.createExternalCoupledPatchGeometry
+        rm -f log.createExternalCoupledPatchGeometry
         runParallel createExternalCoupledPatchGeometry \
             coupleGroup \
             -commsDir $PWD/comms

tutorials/compressible/rhoPimpleFoam/RAS/externalCoupledSquareBendLiq/externalSolver

@@ -36,7 +36,7 @@ refGrad=0
 valueFraction=1
 
 # Remove any old junk
-\rm -f $lockFile 2>/dev/null
+rm -f "$lockFile"
 
 log()
 {
@@ -208,7 +208,7 @@ case "$action" in
         log "done"
 
         # Cleanup. Remove the lock file
-        \rm -f $lockFile 2>/dev/null
+        rm -f "$lockFile"
         ;;
 esac
 

tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase0
 
 # Remove copies of common files
-\rm -rf constant
+rm -rf constant
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
-\rm -rf 0 constant
+rm -rf 0 constant
 \cp -r ../common/0.orig 0
 \cp -r ../common/constant constant
 

tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase0
 
 # Remove copies of common files
-\rm -rf constant
+rm -rf constant
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
-\rm -rf 0 constant
+rm -rf 0 constant
 \cp -r ../common/0.orig 0
 \cp -r ../common/constant constant
 

tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-rm constant/geometry/boundaryLayer.obj > /dev/null 2>&1
+rm -f constant/geometry/boundaryLayer.obj
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -f  constant/triSurface/*.eMesh*     > /dev/null 2>&1
+rm -f  constant/triSurface/*.eMesh*
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
 
 #------------------------------------------------------------------------------

tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean

@@ -10,6 +10,7 @@ rm -f \
    constant/cellTable \
    constant/polyMesh/cellTableId \
    constant/polyMesh/interfaces  \
-   constant/polyMesh/origCellId  > /dev/null 2>&1
+   constant/polyMesh/origCellId  \
+   ;
 
 #------------------------------------------------------------------------------

tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun

@@ -15,8 +15,8 @@ rm -f \
    constant/cellTable \
    constant/polyMesh/cellTableId \
    constant/polyMesh/interfaces  \
-   constant/polyMesh/origCellId  > /dev/null 2>&1
+   constant/polyMesh/origCellId  \
-
+   ;
 
 if isParallel "$@"
 then

tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
+rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
+rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
+rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
+rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs

@@ -87,8 +87,8 @@ EOF
 
 echo "createGraphs:"
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }

tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/Allrun

@@ -17,7 +17,7 @@ trap '\rm -f comms/OpenFOAM.lock 2>/dev/null' INT
 runApplication decomposePar -allRegions
 
 ## Can verify parallel operation of createExternalCoupledPatchGeometry
-# \rm -f log.createExternalCoupledPatchGeometry
+# rm -f log.createExternalCoupledPatchGeometry
 # runParallel createExternalCoupledPatchGeometry \
 #     -regions '(topAir heater)' coupleGroup \
 #     -commsDir $PWD/comms

tutorials/heatTransfer/chtMultiRegionFoam/externalCoupledHeater/externalSolver

@@ -32,7 +32,7 @@ refGrad=0
 valueFraction=1
 
 # Remove any old junk
-\rm -f $lockFile 2>/dev/null
+rm -f "$lockFile"
 
 log()
 {
@@ -168,7 +168,7 @@ done
 log "done"
 
 # Remove the lock file too
-\rm -f $lockFile 2>/dev/null
+rm -f "$lockFile"
 
 # For log collector:
 echo "End"

tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allclean

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 cleanCase0
-\rm allVisibleFaces.obj 2>/dev/null
+rm -f allVisibleFaces.obj
 
 rm -rf constant/cellToRegion
 rm -rf constant/*/polyMesh  # region meshes

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean

@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
-rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh
 
 rm -rf VTK
 rm -rf constant/cellToRegion

tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/Allrun

@@ -17,7 +17,7 @@ trap '\rm -f comms/OpenFOAM.lock 2>/dev/null' INT
 runApplication decomposePar -allRegions
 
 ## Can verify parallel operation of createExternalCoupledPatchGeometry
-# \rm -f log.createExternalCoupledPatchGeometry
+# rm -f log.createExternalCoupledPatchGeometry
 # runParallel createExternalCoupledPatchGeometry \
 #     -regions '(topAir heater)' coupleGroup \
 #     -commsDir $PWD/comms

tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/externalSolver

@@ -32,7 +32,7 @@ refGrad=0
 valueFraction=1
 
 # Remove any old junk
-\rm -f $lockFile 2>/dev/null
+rm -f "$lockFile"
 
 log()
 {
@@ -169,7 +169,7 @@ done
 log "done"
 
 # Remove the lock file too
-\rm -f $lockFile 2>/dev/null
+rm -f "$lockFile"
 
 # For log collector:
 echo "End"

tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/createGraphs

@@ -37,8 +37,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Stop on first error
 set -e
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "FOAM FATAL ERROR: gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }

tutorials/incompressible/adjointOptimisationFoam/motorBike/Allclean

@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase0
 
 # Remove surface and features
-rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/motorBike.obj.gz
-rm -f constant/triSurface/motorBike.eMesh  > /dev/null 2>&1
+rm -f constant/triSurface/motorBike.eMesh
-rm -rf constant/extendedFeatureEdgeMesh    > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
 
 #------------------------------------------------------------------------------

tutorials/incompressible/adjointOptimisationFoam/sbend/turbulent/lowRe/multiPoint/Allclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+#------------------------------------------------------------------------------
 
 # Clean time directories and processors
 rm -rf *[1-9]* processor*
@@ -8,6 +9,6 @@ rm -rf *[1-9]* processor*
 rm -rf optimisation constant/controlPoints
 
 # Clean logs
-rm -f log.* 2>/dev/null
+rm -f log.*
 
 #------------------------------------------------------------------------------

tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun

@@ -36,8 +36,9 @@ done
 if notTest $@
 then
     # create validation plot
-    # Test if gnuplot exists on the system
+
-    command -v gnuplot >/dev/null 2>&1 || {
+    # Require gnuplot
+    command -v gnuplot >/dev/null || {
         echo "gnuplot not found - skipping graph creation" 1>&2
         exit 1
     }

tutorials/incompressible/lumpedPointMotion/building/Allrun

@@ -62,7 +62,7 @@ copyParallelPointDisplacement()
             if [ -d "$proc/$latestTime" -a ! -d "$proc/$deltaT" ]
             then
                 mv $proc/$latestTime $proc/$deltaT
-                \rm -rf $proc/$deltaT/uniform
+                rm -rf "$proc/$deltaT/uniform"
             fi
         done
     )

tutorials/incompressible/lumpedPointMotion/building/files/Allrun.transient

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 # Cleanup old junk that may prevent things from starting
-\rm -f comms/OpenFOAM.lock
+rm -f comms/OpenFOAM.lock
 
 # If OpenFOAM stops prematurely, trigger the external solver to stop
 trap '[ -e comms/OpenFOAM.lock ] && echo "status=done" > comms/OpenFOAM.lock' EXIT TERM INT

tutorials/incompressible/lumpedPointMotion/building/steady/Allrun.pre

@@ -10,7 +10,7 @@ cp $FOAM_TUTORIALS/resources/geometry/building_wtc2.obj constant/triSurface/
 # runApplication surfaceFeatureExtract
 runApplication blockMesh
 
-\rm -f constant/polyMesh/*Level
+rm -f constant/polyMesh/*Level
 
 unset parallel
 parallel=true
@@ -23,7 +23,7 @@ then
     # Serial
 
     runApplication snappyHexMesh -overwrite
-    \rm -f constant/polyMesh/refinementHistory*
+    rm -f constant/polyMesh/refinementHistory*
 
     restore0Dir
 

tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allclean

@@ -4,6 +4,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 cleanCase
-\rm -rf constant/boundaryData *.png
+rm -rf constant/boundaryData *.png
 
 # -----------------------------------------------------------------------------

tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/Allrun

@@ -29,8 +29,9 @@ runParallel $(getApplication)
 if notTest $@
 then
     # create validation plot
-    # Test if gnuplot exists on the system
+
-    command -v gnuplot >/dev/null 2>&1 || {
+    # Require gnuplot
+    command -v gnuplot >/dev/null || {
         echo "gnuplot not found - skipping graph creation" 1>&2
         exit 1
     }

tutorials/incompressible/pimpleFoam/RAS/ellipsekkLOmega/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -f ppGeometry.vtp 2>/dev/null
+rm -f ppGeometry.vtp
 
 #------------------------------------------------------------------------------

tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean

@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase0
 
 # Remove surfaces and features
-rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/propellerTip.obj.gz
-rm -f constant/triSurface/*.eMesh*            > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh*
-rm -rf constant/extendedFeatureEdgeMesh       > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
 
 #------------------------------------------------------------------------------

tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/Allclean

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase0
 
 # Remove surfaces and features
-rm -f constant/triSurface/*.eMesh*            > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh*
-rm -rf constant/extendedFeatureEdgeMesh       > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
 
 #------------------------------------------------------------------------------

tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun

@@ -26,7 +26,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 (
     cd wingMotion2D_pimpleFoam || exit 1
 
-    \rm -rf constant/polyMesh
+    rm -rf constant/polyMesh
     \cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant
     restore0Dir
     runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent

tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/createGraph

@@ -3,8 +3,8 @@
 tail -n +4 ../postProcessing/probes/0/U  | \
     tr -s " " | tr -d '(' | cut -d " " -f2-3 > ../Numerical.dat
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }

tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase0
 
 # Remove copies of common files
-\rm -rf constant
+rm -rf constant
 
 #------------------------------------------------------------------------------

tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
-\rm -rf 0 constant
+rm -rf 0 constant
 \cp -r ../common/0.orig 0
 \cp -r ../common/constant constant
 

tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase0
 
 # Remove copies of common files
-\rm -rf constant
+rm -rf constant
 
 #------------------------------------------------------------------------------

tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
-\rm -rf 0 constant
+rm -rf 0 constant
 \cp -r ../common/0.orig 0
 \cp -r ../common/constant constant
 

tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allclean

@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-rm *.obj > /dev/null 2>&1
+rm -f *.obj
-rm -r constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
-rm constant/triSurface/boundaryAndFaceZones.eMesh > /dev/null 2>&1
+rm -f constant/triSurface/boundaryAndFaceZones.eMesh
 
 #------------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/T3A/validation/createGraphs

@@ -1,8 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+#------------------------------------------------------------------------------
 
-# Test if gnuplot exists on the system
+# Require gnuplot
-command -v gnuplot >/dev/null 2>&1 || {
+command -v gnuplot >/dev/null || {
     echo "gnuplot not found - skipping graph creation" 1>&2
     exit 1
 }

tutorials/incompressible/simpleFoam/airFoil2D/Allclean

@@ -1,9 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
+#------------------------------------------------------------------------------
 
 # Clean time directories only
-
 rm -rf *[1-9]*
-rm -f log.* 2>/dev/null
+rm -f log.*
 
 #------------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-\rm -rf *.dat *.png
+rm -rf *.dat *.png
 
 # -----------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/backwardFacingStep2D/Allrun

@@ -10,8 +10,8 @@ if notTest $@
 then
     # Create validation plots
 
-    # Test if gnuplot exists on the system
+    # Require gnuplot
-    command -v gnuplot >/dev/null 2>&1 || {
+    command -v gnuplot >/dev/null || {
         echo "gnuplot not found - skipping graph creation" 1>&2
         exit 1
     }
@@ -25,8 +25,8 @@ then
         exit 1
     }
 
-    # Test if awk exists on the system
+    # Require awk
-    command -v awk >/dev/null 2>&1 || {
+    command -v awk >/dev/null || {
         echo "awk not found - skipping graph creation" 1>&2
         exit 1
     }
@@ -71,7 +71,7 @@ EOF1
     foamDictionary -entry boundaryField.lowerWall.value -value $timeDir/wallShearStress | \
         sed -n '/(/,/)/p' | sed -e 's/[()]//g;/^\s*$/d' > tau.$$
     paste -d ' ' Cx.$$ tau.$$ >> tauw.dat
-    \rm -f Cx.$$ tau.$$
+    rm -f Cx.$$ tau.$$
 
     graphNameTau="backwardStep2D_tau.png"
     echo "Creating wallshear stress graph to $graphNameTau"

tutorials/incompressible/simpleFoam/bump2D/Allclean

@@ -4,6 +4,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 #------------------------------------------------------------------------------
 
 cleanCase
-\rm -f *.png
+rm -rf *.png
 
 #------------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/bump2D/plot

@@ -92,14 +92,14 @@ if notTest $@
 then
     # Create validation plots
 
-    # Test if gnuplot exists on the system
+    # Require gnuplot
-    command -v gnuplot >/dev/null 2>&1 || {
+    command -v gnuplot >/dev/null || {
         echo "gnuplot not found - skipping graph creation" 1>&2
         exit 1
     }
 
-    # Test if awk exists on the system
+    # Require awk
-    command -v awk >/dev/null 2>&1 || {
+    command -v awk >/dev/null || {
         echo "awk not found - skipping graph creation" 1>&2
         exit 1
     }

tutorials/incompressible/simpleFoam/motorBike/Allclean

@@ -6,8 +6,8 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase0
 
 # Remove surface and features
-rm -f constant/triSurface/motorBike.obj.gz > /dev/null 2>&1
+rm -f constant/triSurface/motorBike.obj.gz
-rm -f constant/triSurface/motorBike.eMesh  > /dev/null 2>&1
+rm -f constant/triSurface/motorBike.eMesh
-rm -rf constant/extendedFeatureEdgeMesh    > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
 
 #------------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/rotorDisk/Allclean

@@ -6,10 +6,10 @@ cd ${0%/*} || exit 1                                # Run from this directory
 cleanCase
 
 # Remove surface and features
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
-rm -f constant/triSurface/rotatingZone.eMesh > /dev/null 2>&1
+rm -f constant/triSurface/rotatingZone.eMesh
-rm -f constant/triSurface/fixed.eMesh > /dev/null 2>&1
+rm -f constant/triSurface/fixed.eMesh
-rm -f 0/pointLevel > /dev/null 2>&1
+rm -f 0/pointLevel
-rm -f 0/cellLevel > /dev/null 2>&1
+rm -f 0/cellLevel
 
 #------------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-\rm -rf 0 postProcessing-*
+rm -rf 0 postProcessing-*
-\rm -f *.dat *.png constant/turbulenceProperties
+rm -f *.dat *.png constant/turbulenceProperties
 
 #------------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
-rm -f constant/triSurface/buildings.eMesh > /dev/null 2>&1
+rm -f constant/triSurface/buildings.eMesh
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/MPPICFoam/cyclone/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase
 
-# rm -f constant/triSurface/cyclone.stl.gz > /dev/null 2>&1
+# rm -f constant/triSurface/cyclone.stl*
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun

@@ -10,7 +10,7 @@ cd ${0%/*} || exit 1                                # Run from this directory
     runApplication decomposePar
     runParallel $(getApplication)
     runApplication reconstructPar -latestTime
-    rm log.reconstructPar
+    rm -f log.reconstructPar
     runApplication reconstructPar -lagrangianFields \
         '(collisionRecordsPairAccessed collisionRecordsPairData \
           collisionRecordsPairOrigIdOfOther \

tutorials/lagrangian/reactingParcelFoam/hotBoxes/patchifyObstacles

@@ -25,7 +25,7 @@ nz=2
 
 
 tmpSetSet='patchify.setSet'
-rm -f patchify.setSet >/dev/null 2>&1
+rm -f patchify.setSet
 
 
 initialiseFaceSet()

tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun

@@ -11,7 +11,7 @@ restore0Dir
 # initialise with potentialFoam solution
 runApplication potentialFoam
 
-\rm -f 0/phi
+rm -f 0/phi
 
 # run the solver
 runApplication $(getApplication)

tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun

@@ -11,7 +11,7 @@ restore0Dir
 # initialise with potentialFoam solution
 runApplication potentialFoam
 
-\rm -f 0/phi
+rm -f 0/phi
 
 # run the solver
 runApplication $(getApplication)

tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun

@@ -10,7 +10,7 @@ runApplication blockMesh
 runApplication potentialFoam
 
 # Remove incompatible (volumetric) flux field
-\rm -f 0/phi 2>/dev/null
+rm -f 0/phi
 
 runApplication $(getApplication)
 

tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun-parallel

@@ -10,7 +10,7 @@ runApplication blockMesh
 runApplication potentialFoam
 
 # Remove incompatible (volumetric) flux field
-\rm -f 0/phi 2>/dev/null
+rm -f 0/phi
 
 runApplication decomposePar
 

tutorials/mesh/foamyHexMesh/blob/Allclean

@@ -5,19 +5,18 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -rf constant/triSurface/blob.stl.gz > /dev/null 2>&1
+rm -rf constant/triSurface/blob.stl.gz
 
-rm -rf constant/cellAlignments > /dev/null 2>&1
+rm -rf constant/cellAlignments
-rm -rf constant/targetCellSize > /dev/null 2>&1
+rm -rf constant/targetCellSize
-rm -rf constant/internalDelaunayVertices > /dev/null 2>&1
+rm -rf constant/internalDelaunayVertices
 
-rm -rf constant/backgroundMeshDecomposition/polyMesh/boundary > /dev/null 2>&1
+(
-rm -rf constant/backgroundMeshDecomposition/polyMesh/faces > /dev/null 2>&1
+    cd constant/backgroundMeshDecomposition/polyMesh 2>/dev/null || exit 1
-rm -rf constant/backgroundMeshDecomposition/polyMesh/neighbour > /dev/null 2>&1
+    rm -f boundary faces neighbour owner points
-rm -rf constant/backgroundMeshDecomposition/polyMesh/owner > /dev/null 2>&1
+)
-rm -rf constant/backgroundMeshDecomposition/polyMesh/points > /dev/null 2>&1
 
-rm -rf snapToSurface?.obj > /dev/null 2>&1
+rm -rf snapToSurface?.obj
-rm -rf tetsToSnapTo.obj > /dev/null 2>&1
+rm -rf tetsToSnapTo.obj
 
 #------------------------------------------------------------------------------

tutorials/mesh/foamyHexMesh/flange/Allclean

@@ -5,18 +5,17 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -r constant/triSurface/flange.stl.gz > /dev/null 2>&1
+rm -r constant/triSurface/flange.stl.gz
 
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
-rm -r constant/ccx constant/ccy constant/ccz > /dev/null 2>&1
+rm -r constant/ccx constant/ccy constant/ccz
-rm -r constant/internalDelaunayVertices constant/targetCellSize > /dev/null 2>&1
+rm -r constant/internalDelaunayVertices constant/targetCellSize
 
-rm -rf constant/backgroundMeshDecomposition/polyMesh/boundary > /dev/null 2>&1
+(
-rm -rf constant/backgroundMeshDecomposition/polyMesh/faces > /dev/null 2>&1
+    cd constant/backgroundMeshDecomposition/polyMesh 2>/dev/null && \
-rm -rf constant/backgroundMeshDecomposition/polyMesh/neighbour > /dev/null 2>&1
+    rm -f faces neighbour owner points
-rm -rf constant/backgroundMeshDecomposition/polyMesh/owner > /dev/null 2>&1
+)
-rm -rf constant/backgroundMeshDecomposition/polyMesh/points > /dev/null 2>&1
 
-rm -r *.obj > /dev/null 2>&1
+rm -r *.obj
 
 #------------------------------------------------------------------------------

tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre

@@ -16,7 +16,7 @@ intersectSurfaces()
 }
 
 
-\rm -rf 0
+rm -rf 0
 
 
 # Run the surface preparation script
@@ -76,7 +76,7 @@ then
     runApplication reconstructParMesh -latestTime
 
     \cp -r $latestTime/polyMesh constant
-    \rm -rf $latestTime
+    rm -rf $latestTime
 fi
 
 

tutorials/mesh/foamyHexMesh/simpleShapes/Allclean

@@ -5,13 +5,12 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -r constant/extendedFeatureEdgeMesh constant/internalDelaunayVertices > /dev/null 2>&1
+rm -r constant/extendedFeatureEdgeMesh constant/internalDelaunayVertices
-rm -f constant/triSurface/*.eMesh > /dev/null 2>&1
+rm -f constant/triSurface/*.eMesh
-rm -f constant/triSurface/*_orient* > /dev/null 2>&1
+rm -f constant/triSurface/*_orient*
-rm -r constant/tetDualMesh > /dev/null 2>&1
+rm -r constant/tetDualMesh
 
-rm -r snapToSurface?.obj tetsToSnapTo.obj > /dev/null 2>&1
+rm -r snapToSurface?.obj tetsToSnapTo.obj
-
+rm -f domain coneAndSphere
-rm domain coneAndSphere > /dev/null 2>&1
 
 #------------------------------------------------------------------------------

tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean

@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1                                # Run from this directory
 
 cleanCase0
 
-rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
+rm -rf constant/extendedFeatureEdgeMesh
-rm -rf constant/triSurface/*.eMesh > /dev/null 2>&1
+rm -rf constant/triSurface/*.eMesh
-rm -rf MeshedSurface.obj > /dev/null 2>&1
+rm -rf MeshedSurface.obj
 
 #------------------------------------------------------------------------------