diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview index f6cd6a8ce7f46312a9d42cdf118a23b6b9c5dc58..c686b32702a744de1cb79faf307d86b9fd3717c7 100644 --- a/etc/config.sh/paraview +++ b/etc/config.sh/paraview @@ -34,11 +34,16 @@ #------------------------------------------------------------------------------ # clean the PATH -cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"` && PATH="$cleaned" +cleaned=$($WM_PROJECT_DIR/bin/foamCleanPath "$PATH" \ + "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- \ + $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-" \ + ) \ + && PATH="$cleaned" # determine the cmake to be used unset CMAKE_HOME -for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 +for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 \ + cmake-2.8.1 do cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake if [ -r $cmake ] @@ -88,7 +93,8 @@ case "$ParaView_VERSION" in [0-9]*) # extract major from the version - ParaView_MAJOR=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'` + ParaView_MAJOR=$(echo $ParaView_VERSION | \ + sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/') ;; esac export ParaView_VERSION ParaView_MAJOR