diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2012-11-12 13:06:06 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@unixuser.org> | 2013-02-17 10:28:20 +0900 |
| commit | 1b7a0c6c7b855e6204830656a699483898329bc1 (patch) | |
| tree | 93f6124eaa7ca2a5db0d12cca7dff7cd7fea25b7 /bin | |
| parent | 4000c25a71121d83744fc50072f2c9034e2456ab (diff) | |
| download | caribou-1b7a0c6c7b855e6204830656a699483898329bc1.tar.gz | |
Port daemon from Python to Vala
This eliminates the need of the shell script wrapper.
https://bugzilla.gnome.org/show_bug.cgi?id=688218
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Makefile.am | 2 | ||||
| -rwxr-xr-x | bin/caribou.in | 41 |
2 files changed, 1 insertions, 42 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index b001b10..2b1839a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -bin_SCRIPTS = caribou caribou-preferences +bin_SCRIPTS = caribou-preferences libexec_SCRIPTS = antler-keyboard DISTCLEANFILES = $(bin_SCRIPTS) $(libexec_SCRIPTS) diff --git a/bin/caribou.in b/bin/caribou.in deleted file mode 100755 index f2cdc2f..0000000 --- a/bin/caribou.in +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# -# Caribou - text entry and UI navigation application -# -# Copyright (C) 2009 Adaptive Technology Resource Centre -# * Contributor: Ben Konrath <ben@bagu.org> -# Copyright (C) 2009 Eitan Isaacson <eitan@monotonous.org> -# Copyright (C) 2009 Sun Microsystems, Inc. -# * Contributor: Willie Walker <william.walker@sun.com> -# Copyright (C) 2009 Flavio Percoco <flaper87@flaper87.org> -# * Contributor: Flavio Percoco <flaper87@flaper87.org> -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by the -# Free Software Foundation; either version 2.1 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License -# for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -script_dir="$(dirname "$(readlink -f ${0})")" - -prefix=@prefix@ -exec_prefix=@exec_prefix@ - -if [ $script_dir = "@bindir@" ] -then - export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" - export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -else - export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" - export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -fi - -@PYTHON@ -c "from caribou.daemon.main import CaribouDaemon; CaribouDaemon().run()" |