sh: use a worse version of _wvfind_caller if bash isn't available.

bash has tools for finding the file/linenumber of the caller, but it's not
POSIX, so don't rely on it.

diff --git a/sh/t/twvtest.sh b/sh/t/twvtest.sh
index 875dd5373ce621f45e85d96db2153c657e6ab0be..c02871afd0afefcb9deef9509e73af58fbb5172a 100755 (executable)
--- a/sh/t/twvtest.sh
+++ b/sh/t/twvtest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 . ./wvtest.sh
 
 WVSTART "main test"

diff --git a/sh/wvtest.sh b/sh/wvtest.sh
index 44f7d9e2d021e446665d0394d227bfd8d4d1a79a..b90c8bf8bb76bd7bf18c6244d87486e3f67a7fbe 100644 (file)
--- a/sh/wvtest.sh
+++ b/sh/wvtest.sh
@@ -12,12 +12,23 @@ _wvtextclean()
        ( set -f; echo $* )
 }
 
-_wvfind_caller()
-{
-       LVL=$1
-       WVCALLER_FILE=${BASH_SOURCE[2]}
-       WVCALLER_LINE=${BASH_LINENO[1]}
-}
+
+if [ -n "$BASH_VERSION" ]; then
+       _wvfind_caller()
+       {
+               LVL=$1
+               WVCALLER_FILE=${BASH_SOURCE[2]}
+               WVCALLER_LINE=${BASH_LINENO[1]}
+       }
+else
+       _wvfind_caller()
+       {
+               LVL=$1
+               WVCALLER_FILE="unknown"
+               WVCALLER_LINE=0
+       }
+fi
+
 
 _wvcheck()
 {