From cd81471175c92d96c593c6fe7b7a37cd491d9e78 Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Tue, 13 Oct 2009 19:15:58 -0400 Subject: [PATCH] usttrace: enhance --- usttrace | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/usttrace b/usttrace index cb94640..689cdde 100755 --- a/usttrace +++ b/usttrace @@ -3,13 +3,14 @@ # usttrace by Pierre-Marc Fournier 2009 # Distributed under the GPLv2. -USTD="./ustd/ustd" -LIBINTERFORK_PATH="./libinterfork/.libs/libinterfork.so" -LIBMALLOCWRAP_PATH="./libmallocwrap/.libs/libmallocwrap.so" +USTTRACE_DIR="$(dirname $0)" +USTD="${USTTRACE_DIR}/ustd/ustd" +LIBINTERFORK_PATH="${USTTRACE_DIR}/libinterfork/.libs/libinterfork.so" +LIBMALLOCWRAP_PATH="${USTTRACE_DIR}/libmallocwrap/.libs/libmallocwrap.so" -STD_LDLIBRARY_UST="./libust/.libs:../liburcu" +STD_LDLIBRARY_UST="${USTTRACE_DIR}/libust/.libs" -BASE_TRACE_DIR="$HOME/.usttraces" +BASE_TRACE_DIR="${HOME}/.usttraces" function usage () { echo "usage: $0 OPTIONS COMMAND" 2>/dev/stderr @@ -44,6 +45,12 @@ while getopts ":hlLmfs" options; do done shift $(($OPTIND - 1)) +if [ ! -x "$USTD" ]; +then + error "specified path to ustd not executable ($USTD)" + exit 1 +fi + # Prepare vars CMD=$1 -- 2.34.1