diff --git a/bin/foamEtcFile b/bin/foamEtcFile index ea1d1c3fbf..195b91bdbe 100755 --- a/bin/foamEtcFile +++ b/bin/foamEtcFile @@ -46,7 +46,7 @@ printHelp() { cat<&2 # done - -# Save the essential bits of information -# silently remove leading ~OpenFOAM/ (used in Foam::findEtcFile) -nArgs=$# -fileName="${1#~OpenFOAM/}" - # Define the various places to be searched: unset dirList case "$optMode" in (*u*) # (U)ser @@ -435,7 +454,12 @@ else echo "$verboseOutput$resolved" 1>&2 fi - echo "$shellOutput$resolved" + if [ -n "$shellOutput" ] + then + echo "$shellOutput$resolved $evalArgs" + else + echo "$resolved" + fi [ -n "$optAll" ] || break fi done diff --git a/etc/bashrc b/etc/bashrc index c7f8b7eb77..f8d87bd4eb 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -153,7 +153,7 @@ _foamEtc -config settings # Setup for third-party packages # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ _foamEtc -config mpi -_foamEtc -config paraview +_foamEtc -config paraview -- $@ # Pass through for evaluation _foamEtc -config vtk _foamEtc -config ensight _foamEtc -config gperftools diff --git a/etc/cshrc b/etc/cshrc index a678eda3c1..8545e9f098 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -196,7 +196,7 @@ _foamEtc -config settings # Setup for third-party packages # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ _foamEtc -config mpi -_foamEtc -config paraview +_foamEtc -config paraview -- "$FOAM_SETTINGS" # Pass through for evaluation _foamEtc -config vtk _foamEtc -config ensight ## _foamEtc -config ADIOS