[tomboy] Remove uninstalled running support from wrapper script
- From: Sanford Armstrong <sharm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tomboy] Remove uninstalled running support from wrapper script
- Date: Sat, 26 Jun 2010 14:09:31 +0000 (UTC)
commit 6781baf8f823baacfb69722cc1ead2391277fa4a
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date: Sat Jun 26 07:00:36 2010 -0700
Remove uninstalled running support from wrapper script
Tomboy/tomboy.in | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 deletions(-)
---
diff --git a/Tomboy/tomboy.in b/Tomboy/tomboy.in
index 807dabf..4512746 100644
--- a/Tomboy/tomboy.in
+++ b/Tomboy/tomboy.in
@@ -1,43 +1,32 @@
#!/usr/bin/env bash
-if [ "x$PWD" = "x srcdir@" ] ; then
- echo "*** Running uninstalled @target@ ***"
+export LD_LIBRARY_PATH="@pkglibdir ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
+export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
- export LD_LIBRARY_PATH="../libtomboy/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}:./Addins/PrintNotes/.libs"
- export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@"
- export MONO_PATH=$MONO_PATH:./Addins:../Mono.Addins/Mono.Addins:../Mono.Addins/Mono.Addins.Setup:../Mono.Addins/Mono.Addins.Gui
+THIS_EXE="@pkglibdir@/@target@"
- THIS_EXE="--debug ./@target@"
-else
- export LD_LIBRARY_PATH="@pkglibdir ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
- export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
- export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
+[ -n "$TOMBOY_DEBUG" ] && TOMBOY_DEBUG="--debug"
+[ -n "$TOMBOY_TRACE" ] && TOMBOY_TRACE="--trace=$TOMBOY_TRACE"
+[ -n "$TOMBOY_PROFILE" ] && TOMBOY_PROFILE="--profile=$TOMBOY_PROFILE"
- THIS_EXE="@pkglibdir@/@target@"
+for arg in $*; do
+ case "x--debug" in ("x$arg")
+ TOMBOY_DEBUG=$arg
+ esac
- [ -n "$TOMBOY_DEBUG" ] && TOMBOY_DEBUG="--debug"
- [ -n "$TOMBOY_TRACE" ] && TOMBOY_TRACE="--trace=$TOMBOY_TRACE"
- [ -n "$TOMBOY_PROFILE" ] && TOMBOY_PROFILE="--profile=$TOMBOY_PROFILE"
+ case "x--trace=" in ("x${arg:0:8}")
+ TOMBOY_TRACE=$arg
+ esac
- for arg in $*; do
- case "x--debug" in ("x$arg")
- TOMBOY_DEBUG=$arg
- esac
-
- case "x--trace=" in ("x${arg:0:8}")
- TOMBOY_TRACE=$arg
- esac
-
- case "x--profile=" in ("x${arg:0:10}")
- TOMBOY_PROFILE=$arg
- esac
- done
-
- if [ -n "$TOMBOY_DEBUG" -o -n "$TOMBOY_TRACE" -o -n "$TOMBOY_PROFILE" -o -n "$MONO_EXTRA_ARGS" ]; then
- MONO_OPTIONS="$TOMBOY_DEBUG $TOMBOY_TRACE $TOMBOY_PROFILE $MONO_EXTRA_ARGS"
- echo "** Running Mono with $MONO_OPTIONS **"
- fi
+ case "x--profile=" in ("x${arg:0:10}")
+ TOMBOY_PROFILE=$arg
+ esac
+done
+if [ -n "$TOMBOY_DEBUG" -o -n "$TOMBOY_TRACE" -o -n "$TOMBOY_PROFILE" -o -n "$MONO_EXTRA_ARGS" ]; then
+ MONO_OPTIONS="$TOMBOY_DEBUG $TOMBOY_TRACE $TOMBOY_PROFILE $MONO_EXTRA_ARGS"
+ echo "** Running Mono with $MONO_OPTIONS **"
fi
if [ -n "@extragac@" ]; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]