Merge pull request #1843 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop …

…to develop

* commit 'c3c044cc003d6a4039635e638e1cd1c2487be177':
  Escape { and } in regex as required by sh in updated cori.nersc.gov. Tested change on jam, jelly, emu, ostrich and osx1011test.

bin/h5vers

@@ -377,7 +377,7 @@ if ($H5_JAVA) {
   my $version_string2 = sprintf("%d, %d, %d", @newver[0,1,2]);
 
   $data =~ s/\@version HDF5 .* <BR>/\@version HDF5 $version_string1 <BR>/;
-  $data =~ s/    public final static int LIB_VERSION\[\] = { \d*, \d*, \d* };/    public final static int LIB_VERSION[] = { $version_string2 };/;
+  $data =~ s/    public final static int LIB_VERSION\[\] = \{ \d*, \d*, \d* \};/    public final static int LIB_VERSION[] = \{ $version_string2 \};/;
 
   write_file($H5_JAVA, $data);
 }
@@ -394,7 +394,7 @@ if ($TESTH5_JAVA) {
   my $version_string1 = sprintf("%d, %d, %d", @newver[0,1,2]);
   my $version_string2 = sprintf("int majnum = %d, minnum = %d, relnum = %d", @newver[0,1,2]);
 
-  $data =~ s/        int libversion\[\] = { .* };/        int libversion\[\] = { $version_string1 };/;
+  $data =~ s/        int libversion\[\] = \{ .* \};/        int libversion\[\] = \{ $version_string1 \};/;
   $data =~ s/        int majnum = \d*, minnum = \d*, relnum = \d*;/        $version_string2;/;
 
   write_file($TESTH5_JAVA, $data);
@@ -405,7 +405,7 @@ if ($REPACK_LAYOUT_PLUGIN_VERSION) {
   my $data = read_file($REPACK_LAYOUT_PLUGIN_VERSION);
   my $version_string = sprintf("%d %d %d", @newver[0,1,2]);
 
-  $data =~ s/            PARAMS { 9 \d* \d* \d* }/            PARAMS { 9 $version_string }/g;
+  $data =~ s/            PARAMS \{ 9 \d* \d* \d* \}/            PARAMS \{ 9 $version_string \}/g;
 
   write_file($REPACK_LAYOUT_PLUGIN_VERSION, $data);
 }