scripts: don't put "fi fi fi" on the same line

sh (not bash) doesn't like it Refs #675 Signed-off-by: Brice Goglin <[email protected]> (cherry picked from commit a3b64d5)
open-mpi · Jul 29, 2024 · 54a3fa0 · 54a3fa0
1 parent 8ba621a
commit 54a3fa0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/config/hwloc.m4 b/config/hwloc.m4
@@ -1052,7 +1052,9 @@ return 0;
 	AC_MSG_NOTICE([using default CUDA install path /usr/local/cuda ...])
         HWLOC_CUDA_COMMON_LDFLAGS="-L/usr/local/cuda/lib64/ -L/usr/local/cuda/lib64/stubs/"
         HWLOC_CUDA_COMMON_CPPFLAGS="-I/usr/local/cuda/include/"
-      fi fi fi
+      fi
+      fi
+      fi
 
       AC_MSG_NOTICE([common CUDA/OpenCL/NVML CPPFLAGS: $HWLOC_CUDA_COMMON_CPPFLAGS])
       AC_MSG_NOTICE([common CUDA/OpenCL/NVML LDFLAGS: $HWLOC_CUDA_COMMON_LDFLAGS])
@@ -1276,7 +1278,9 @@ char nvmlInit ();
         AC_MSG_NOTICE([using standard ROCm install path $rocm_dir ...])
       else
         AC_MSG_NOTICE([assuming ROCm is installed in standard directories ...])
-      fi fi fi
+      fi
+      fi
+      fi
       if test "x$rocm_dir" != x; then
          if test -d "$rocm_dir/include/rocm_smi"; then
            HWLOC_RSMI_CPPFLAGS="-I$rocm_dir/include/"
@@ -1604,7 +1608,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
       requested_plugins=`echo $enable_plugins | sed -e 's/,/ /g'`
     else
       hwloc_have_plugins=no
-    fi fi
+    fi
+    fi
     AC_MSG_RESULT($hwloc_have_plugins)
 
     if test "x$hwloc_have_plugins" = xyes; then
@@ -1617,7 +1622,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
         else if test "x$hwloc_windows" = "xyes"; then
           AC_MSG_WARN([dlopen not supported on non-native Windows build, disabled by default.])
           enable_plugin_dlopen=no
-        fi fi
+        fi
+        fi
       fi
       if test "x$enable_plugin_ltdl" = x; then
         if test "x$hwloc_aix" = "xyes"; then
@@ -1626,7 +1632,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
         else if test "x$hwloc_windows" = "xyes"; then
           AC_MSG_WARN([ltdl not supported on non-native Windows build, disabled by default.])
           enable_plugin_dlopen=no
-        fi fi
+        fi
+        fi
       fi
 
       # Look for dlopen
@@ -1659,7 +1666,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
         AC_MSG_RESULT([none])
         AC_MSG_WARN([Plugin support requested, but could not enable dlopen or ltdl])
         AC_MSG_ERROR([Cannot continue])
-      fi fi
+      fi
+      fi
 
       AC_DEFINE([HWLOC_HAVE_PLUGINS], 1, [Define to 1 if the hwloc library should support dynamically-loaded plugins])
     fi

diff --git a/contrib/dist/publish_doc b/contrib/dist/publish_doc
@@ -24,7 +24,10 @@ else if test -d "$dst/$EXAMPLE/"; then
 else
   echo "ERROR: Cannot find doc subdirectory in destination path."
   exit 1
-fi fi fi fi
+fi
+fi
+fi
+fi
 echo "Will copy documentation to $dst"
 
 while test `pwd` != /; do
@@ -52,7 +55,9 @@ else if ! test -e doc/doxygen-doc/hwloc-letter.pdf; then
 else if ! test -d doc/www.open-mpi.org/html/; then
   echo "ERROR: doc/www.open-mpi.org/html/ not found."
   exit 1
-fi fi fi
+fi
+fi
+fi
 
 echo "Installing hwloc-v${VERSION}-a4.pdf ..."
 cp -f doc/doxygen-doc/hwloc-a4.pdf "$dst/hwloc-v${VERSION}-a4.pdf"

diff --git a/tests/hwloc/xml/test-topology.sh.in b/tests/hwloc/xml/test-topology.sh.in
@@ -144,6 +144,7 @@ else if test "$filename" = "${basename}.output"; then
 else
   echo "Filename must end with either .xml or .output"
   exit 1
-fi fi
+fi
+fi
 
 rm -rf "$tmp"
diff --git a/utils/hwloc/hwloc-gather-topology.in b/utils/hwloc/hwloc-gather-topology.in
@@ -285,7 +285,8 @@ if ! test -d "$destdir/$basename/var/run/hwloc"; then
     ln -sr "$destdir/$basename/var/run/hwloc.HWLOC_DUMPED_HWDATA_DIR" "$destdir/$basename/var/run/hwloc"
   else if test -e "$destdir/$basename/$runstatedir/hwloc"; then
     ln -sr "$destdir/$basename/var/run/hwloc.runstatedir" "$destdir/$basename/var/run/hwloc"
-  fi fi
+  fi
+  fi
 fi
 
 # Gather cgroup/cpuset mntpnts