Merge branch 'master' into ejh_func_cleanup2

dap4_test/maketests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # The purpose of this program is to fill in the
 # testdata files: dmrtestfiles, daptestfiles, and

dap4_test/test_raw.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
@@ -9,9 +9,9 @@ set -e
 echo "test_raw.sh:"
 
 # Compute the set of testfiles
-PUSHD ${srcdir}/daptestfiles
+cd ${srcdir}/daptestfiles
 F=`ls -1d *.dap`
-POPD
+cd -
 F=`echo $F | tr '\r\n' '  '`
 F=`echo $F | sed -e s/.dap//g`
 
@@ -54,12 +54,12 @@ for f in $F ; do
 	    failure "diff ${f}.dmp"
 	fi
     elif test "x${RESET}" = x1 ; then
-	echo "${f}:" 
+	echo "${f}:"
 	cp ./results_test_raw/${f}.dmp ${BASELINERAW}/${f}.dmp
     elif test "x${DIFF}" = x1 ; then
 	echo "hdrtest: ${f}"
 	rm -f ./tr1 ./tr2 ./tb1 ./tb2
-	baseclean 
+	baseclean
         if ! diff -wBb ./${BASELINERAW}/${f}.dmp ./${BASELINE}/${f}.ncdump ; then
           failure diff -wBb ./${BASELINERAW}/${f}.dmp ./${BASELINE}/${f}.ncdump
 	fi
@@ -68,4 +68,3 @@ done
 rm -rf ./results_test_raw
 
 finish
-

nc_test/make_test_file.sh

@@ -1,2 +1,2 @@
 #! /bin/sh
-./nc_test -c
+./nc_test -c

nc_test/run_diskless2.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh

nc_test4/clear_cache.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/sh -x
 # Clear the disk caches.
 sync
 echo 3 > /proc/sys/vm/drop_caches

nc_test4/run_par_bm_radar_2D.sh

@@ -22,4 +22,4 @@ for numproc in 1 4 16
 done
 echo '*** SUCCESS!!!'
 
-exit 0
+exit 0

nc_test4/tst_filter.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 export SETX=1
 

ncdump/tst_hdf5_offset.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi 
 . ../test_common.sh

ncdump/tst_nccopy3_subset.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Added in support of https://github.com/Unidata/netcdf-c/gh425 and
 # https://github.com/Unidata/netcdf-c/gh469

ncdump/tst_nccopy4.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh

ncdump/tst_nccopy5.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh

ncdump/tst_ncgen4.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Tests for ncgen4 using list of test cdl files from the cdl4
 # directory, and comparing output to expected results in the expected4
 # directory. Note that these tests are run for classic files in

ncdump/tst_netcdf4.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This shell script tests ncdump for netcdf-4
 # Ed Hartnett, Dennis Heimbigner, Ward Fisher
 
@@ -7,7 +7,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 set -e
 
-function ERR {
+ERR() {
     RES=$?
     if [ $RES -ne 0 ]; then
         echo "Error found: $RES"

ncgen/makeparser.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 	flex -Pncg -8 ncgen.l
 	rm -f ncgenl.c
 	sed -e s/lex.ncg.c/ncgenl.c/g <lex.ncg.c >ncgenl.c