Revert the script magic to do relocations, it does not work when the commands are...

svn path=/trunk/mono/; revision=52862

diff --git a/scripts/mono-service.in b/scripts/mono-service.in
index 950c2f66cb47d5eb1853fe3ae547e53a93b852d6..25b789902c47f9701726dcd26f6bdb6f22510013 100644 (file)
--- a/scripts/mono-service.in
+++ b/scripts/mono-service.in
@@ -1,7 +1,4 @@
 #!/bin/sh
-a=`which "$0"`
-d=`dirname "$a"`
-
 args="$@"
 assembly=
 while test x$1 != x; do
@@ -32,4 +29,4 @@ if test x$assembly = x; then
 fi
 
 export MONO_DISABLE_SHM=1
-exec $d/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe $args </dev/null >& /dev/null &
+exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe $args </dev/null >& /dev/null &

diff --git a/scripts/script.in b/scripts/script.in
index 8952ac6d6ea5b0ec066abcde744659bbe11173d2..ef0e2bcffeac50a127d4e4064ef359fc57edbbb7 100644 (file)
--- a/scripts/script.in
+++ b/scripts/script.in
@@ -1,6 +1,2 @@
 #!/bin/sh
-
-a=`which "$0"`
-d=`dirname "$a"`
-
-exec $d/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe "$@"
+exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe "$@"