4 files changed, 14 insertions, 19 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 229712e..740f5c3 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -41,6 +41,6 @@ endif
 # All subdirectories
 SUBDIRS=$(MIRROR_VFD_DIR) $(TESTUTIL_DIR) $(TOOLS_DIR)
 
-bin_SCRIPTS = subfiling_vfd/h5fuse.sh
+bin_SCRIPTS = subfiling_vfd/h5fuse
 
 include $(top_srcdir)/config/conclude.am
diff --git a/utils/mirror_vfd/CMakeLists.txt b/utils/mirror_vfd/CMakeLists.txt
index 51d4694..a123c02 100644
--- a/utils/mirror_vfd/CMakeLists.txt
+++ b/utils/mirror_vfd/CMakeLists.txt
@@ -6,10 +6,10 @@ project (HDF5_UTILS_MIRRORVFD C)
 #-----------------------------------------------------------------------------
 
 set (mirror_server_SOURCES
-        ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_remote.c
-        ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_server.c
-        ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_writer.c
-        ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_remote.h
+    ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_remote.c
+    ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_server.c
+    ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_writer.c
+    ${HDF5_UTILS_MIRRORVFD_SOURCE_DIR}/mirror_remote.h
 )
 add_executable (mirror_server ${mirror_server_SOURCES})
 target_include_directories (mirror_server PRIVATE "${HDF5_UTILS_DIR};${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
@@ -71,10 +71,8 @@ if (HDF5_EXPORTED_TARGETS)
   endforeach ()
 
   install (
-      TARGETS
-          ${H5_DEP_EXECUTABLES}
-      EXPORT
-          ${HDF5_EXPORTED_TARGETS}
+      TARGETS ${H5_DEP_EXECUTABLES}
+      EXPORT ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT utilsapplications
   )
 endif ()
diff --git a/utils/subfiling_vfd/CMakeLists.txt b/utils/subfiling_vfd/CMakeLists.txt
index 3acdc6b..db59710 100644
--- a/utils/subfiling_vfd/CMakeLists.txt
+++ b/utils/subfiling_vfd/CMakeLists.txt
@@ -1,20 +1,17 @@
 cmake_minimum_required (VERSION 3.18)
 project (HDF5_UTILS_SUBFILINGVFD C)
 
-configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.sh.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh @ONLY)
+configure_file (${HDF5_UTILS_SUBFILINGVFD_SOURCE_DIR}/h5fuse.in ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse @ONLY)
 
-# Copy h5fuse.sh to testpar directory for subfiling tests
+# Copy h5fuse to testpar directory for subfiling tests
 if (HDF5_ENABLE_PARALLEL AND HDF5_TEST_PARALLEL)
-  file (
-    COPY
-    ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh
-    DESTINATION
-    ${HDF5_TEST_PAR_BINARY_DIR}
+  file (COPY ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse
+        DESTINATION ${HDF5_TEST_PAR_BINARY_DIR}
   )
 endif ()
 
 install (
-    FILES ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse.sh
+    FILES ${HDF5_UTILS_SUBFILINGVFD_BINARY_DIR}/h5fuse
     DESTINATION ${HDF5_INSTALL_BIN_DIR}
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     COMPONENT utilsapplications
diff --git a/utils/subfiling_vfd/h5fuse.sh.in b/utils/subfiling_vfd/h5fuse.in
index 6f4bf61..a4c6a05 100755
--- a/utils/subfiling_vfd/h5fuse.sh.in
+++ b/utils/subfiling_vfd/h5fuse.in
@@ -26,11 +26,11 @@ function usage {
          configuration file either as a command-line argument or the script will
          search for the *.config file in the current directory."
    echo ""
-   echo "usage: h5fuse.sh [-f filename] [-h] [-p] [-q] [-r] [-v] "
+   echo "usage: h5fuse [-f filename] [-h] [-p] [-q] [-r] [-v] "
    echo "-f filename  Subfile configuration file."
    echo "-h           Print this help."
    echo "-q           Quiet all output. [no]"
-   echo "-p           h5fuse.sh is being run in parallel, with more than one rank. [no]"
+   echo "-p           h5fuse is being run in parallel, with more than one rank. [no]"
    echo "-r           Remove subfiles after being processed. [no]"
    echo "-v           Verbose output. [no]"
    echo ""