[Pkg-cli-apps-commits] [gnome-do] 03/05: Simplify gnome-do launcher script

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository gnome-do.

commit 1e40faaa5cba1886810ce681ff6a5f97b25db682
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Sun Dec 29 13:09:41 2013 +0800

    Simplify gnome-do launcher script
    
    Closes: 650368
---
 .../patches/04_simplify_buggy_launcher_script.diff | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/04_simplify_buggy_launcher_script.diff b/debian/patches/04_simplify_buggy_launcher_script.diff
new file mode 100644
index 0000000..06cabfa
--- /dev/null
+++ b/debian/patches/04_simplify_buggy_launcher_script.diff
@@ -0,0 +1,29 @@
+--- a/Do/gnome-do.in
++++ b/Do/gnome-do.in
+@@ -1,25 +1,3 @@
+ #!/bin/sh
+ 
+-SCRIPT_PATH=`dirname $0`
+-SCRIPT_PATH=`cd $SCRIPT_PATH; pwd`
+-
+-if [ "x$SCRIPT_PATH" = "x at abs_srcdir@/bin/Debug" ] ||
+-   [ "x$SCRIPT_PATH" = "x at abs_srcdir@" ] ; then
+-    echo "*** Running uninstalled ***"
+-    GNOME_DO_EXE="@abs_srcdir@/bin/Debug/Do.exe"
+-else
+-    GNOME_DO_EXE="@expanded_libdir@/@PACKAGE@/Do.exe"
+-fi
+-
+-# Send the dbus Summon signal right away for fastest response if
+-# Do is already running.
+-dbus-send --session --type=method_call --dest='org.gnome.Do' \
+-	'/org/gnome/Do/Controller' 'org.gnome.Do.Controller.Summon'
+-
+-# If Do is not running, run it.
+-if pgrep -u "`id -u`" '^gnome-do$' >/dev/null; then
+-	/usr/bin/cli "$GNOME_DO_EXE" "$@"
+-fi
+-while [ "$?" -eq "20" ]; do
+-	/usr/bin/cli "$GNOME_DO_EXE" "$@"
+-done
++exec /usr/bin/cli /usr/lib/gnome-do/Do.exe "$@"
diff --git a/debian/patches/series b/debian/patches/series
index b3a005f..e7f561d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_fix_libX11_linkage.diff
 02_use_cli_for_wrapper.diff
 03_dbus_sharp_2.diff
+04_simplify_buggy_launcher_script.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-do.git