Ensure that the client/server scripts call the installed copies of any

other systemtap tools.

1 files changed, 13 insertions, 8 deletions

diff --git a/stap-serverd b/stap-serverd
index 2971c67f..2c7abba1 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -24,6 +24,11 @@ function initialization {
     # Default settings.
     avahi_type=_stap._tcp
 
+    # Where are we installed?
+    exec_prefix=`dirname $0`
+    exec_prefix=`cd $exec_prefix && pwd`
+    prefix=`dirname $exec_prefix`
+
     # What port will we listen on?
     port=$1
     test "X$port" = "X" && port=65000
@@ -40,15 +45,15 @@ function initialization {
 	# If no certificate/key database has been specified, then find/create
 	# a local one.
 	if test $EUID = 0; then
-	    ssl_db=`dirname $0`/../etc/systemtap/ssl/server
+	    ssl_db=$prefix/etc/systemtap/ssl/server
 	else
 	    ssl_db=$HOME/.systemtap/ssl/server
 	fi
 	if ! test -f $ssl_db/stap-server.cert; then
-	    stap-gen-server-cert `dirname $ssl_db` || exit 1
+	    $exec_prefix/stap-gen-server-cert `dirname $ssl_db` || exit 1
             # Now add the server's certificate to the client's database,
 	    # making it a trusted peer.
-	    stap-add-server-cert $ssl_db/stap-server.cert `dirname $ssl_db` || exit 1
+	    $exec_prefix/stap-add-server-cert $ssl_db/stap-server.cert `dirname $ssl_db` || exit 1
 	fi
     fi
     nss_pw=$ssl_db/pw
@@ -77,8 +82,8 @@ function advertise_presence {
 function listen {
     # The stap-server-connect program will listen forever
     # accepting requests.
-    stap-server-connect -p $port -n $nss_cert -d $ssl_db -w $nss_pw 2>&1 &
-    wait '%stap-server-connect' >/dev/null 2>&1
+    $exec_prefix/stap-server-connect -p $port -n $nss_cert -d $ssl_db -w $nss_pw 2>&1 &
+    wait '%$exec_prefix/stap-server-connect' >/dev/null 2>&1
 }
 
 # function: fatal [ MESSAGE ]
@@ -98,12 +103,12 @@ function terminate {
     echo "$0: Exiting"
 
     # Kill the running 'avahi-publish-service' job
-    kill -s SIGTERM %avahi-publish-service 2> /dev/null
+    kill -s SIGTERM '%avahi-publish-service' 2> /dev/null
     wait '%avahi-publish-service' >/dev/null 2>&1
 
     # Kill any running 'stap-server-connect' job.
-    kill -s SIGTERM "%stap-server-connect" 2> /dev/null
-    wait "%stap-server-connect"  >/dev/null 2>&1
+    kill -s SIGTERM '%$exec_prefix/stap-server-connect' 2> /dev/null
+    wait '%$exec_prefix/stap-server-connect'  >/dev/null 2>&1
 
     exit
 }