From ec0647137dec0214d6a914b13fb053fe3ac2eb4e Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Tue, 22 Feb 2011 17:36:03 -0500 Subject: [PATCH] usttrace: Use /bin/sh instead of /bin/bash for busybox compatibility The busybox posix like shell does not understand the "function" directive nor does it understand the syntax for redirecting a file via a shell expanded variable with $(<$pidfilepath). Busybox also does not typically provide a link to /bin/bash since busybox does not provide bash. It is possible to work around all these limitations in order to allow user space tracing to work properly in a busybox based environment with several syntax changes to the usttrace script. Signed-off-by: Jason Wessel Signed-off-by: Mathieu Desnoyers --- usttrace | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usttrace b/usttrace index 7c34ca2..54266db 100755 --- a/usttrace +++ b/usttrace @@ -1,16 +1,16 @@ -#!/bin/bash +#!/bin/sh # usttrace by Pierre-Marc Fournier 2009 # Distributed under the GPLv2. -function error() { +error() { echo "$0: error: $1" 2>/dev/stderr } -function sighandler() { +sighandler() { echo "Caught Ctrl-C" if [ -z "${UST_CONSUMERD_PID}" ]; then - UST_CONSUMERD_PID="$(<$pidfilepath)" + UST_CONSUMERD_PID=`cat $pidfilepath` fi # Tell the daemon to die kill -SIGTERM "${UST_CONSUMERD_PID}" @@ -44,7 +44,7 @@ fi BASE_TRACE_DIR="${HOME}/.usttraces" -function usage () { +usage() { echo "usage: $0 OPTIONS COMMAND" 2>/dev/stderr echo "" 2>/dev/stderr echo "Options:" 2>/dev/stderr @@ -134,7 +134,7 @@ then # ust-consumerd writes to pidfile # ust-consumerd closes pidfile # we unblock reading pidfile - UST_CONSUMERD_PID="$(<$pidfilepath)" + UST_CONSUMERD_PID=`cat $pidfilepath` export UST_DAEMON_SOCKET="${UST_CONSUMERD_SOCKPATH}" fi -- 2.34.1