From 1a7575c61b06b2b1c64bf6e0f66744c3cea40ebd Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Tue, 16 Feb 2010 17:03:28 -0500 Subject: [PATCH 1/1] 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. --- sh/t/twvtest.sh | 2 +- sh/wvtest.sh | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sh/t/twvtest.sh b/sh/t/twvtest.sh index 875dd53..c02871a 100755 --- 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 44f7d9e..b90c8bf 100644 --- 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() { -- 2.39.2