diff options
| author | David Young <dyoung@hdfgroup.org> | 2019-12-19 23:24:52 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2019-12-19 23:24:52 (GMT) |
| commit | b55a584fd5b3aac6f2514fba41a6182030b497ae (patch) | |
| tree | 065c2f57d3cabd16be66665403764af06f5abdce | |
| parent | 63fdb7868593639dd7e06dcff85980ed4b29a8c1 (diff) | |
| parent | ec4418a75716b7f2ce53e627de28d139b281b545 (diff) | |
| download | hdf5-b55a584fd5b3aac6f2514fba41a6182030b497ae.zip hdf5-b55a584fd5b3aac6f2514fba41a6182030b497ae.tar.gz hdf5-b55a584fd5b3aac6f2514fba41a6182030b497ae.tar.bz2 | |
Merge pull request #2161 in HDFFV/hdf5 from ~DYOUNG/netbsd:develop to develop
* commit 'ec4418a75716b7f2ce53e627de28d139b281b545':
In portable shell scripts (using #!/bin/sh) we have to use single square brackets, [ ], instead of the bash-ism double square brackets, [[ ]].
Make this script work on hosts where PERL is not installed at /usr/bin/perl.
| -rwxr-xr-x | bin/warnhist | 3 | ||||
| -rw-r--r-- | hl/tools/h5watch/testh5watch.sh.in | 2 | ||||
| -rw-r--r-- | tools/test/h5dump/testh5dump.sh.in | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/bin/warnhist b/bin/warnhist index 7e56246..a8dcd97 100755 --- a/bin/warnhist +++ b/bin/warnhist @@ -1,5 +1,6 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl require 5.003; +use warnings; # # Copyright by The HDF Group. diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in index d31bcc3..24ff6aa 100644 --- a/hl/tools/h5watch/testh5watch.sh.in +++ b/hl/tools/h5watch/testh5watch.sh.in @@ -18,7 +18,7 @@ # supports SWMR. ./swmr_check_compat_vfd rc=$? -if [[ $rc != 0 ]] ; then +if [ $rc != 0 ] ; then echo echo "The VFD specified by the HDF5_DRIVER environment variable" echo "does not support SWMR." diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in index 4b85138..dc7d999 100644 --- a/tools/test/h5dump/testh5dump.sh.in +++ b/tools/test/h5dump/testh5dump.sh.in @@ -923,7 +923,7 @@ GREPTEST() cd $TESTDIR $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@" ) >$actual 2>$actual_err - if [[ "$txttype" = "ERRTXT" ]]; then + if [ "$txttype" = "ERRTXT" ]; then $GREP "$expectdata" $actual_err > /dev/null else $GREP "$expectdata" $actual > /dev/null |