Host the IBus engine inside parleyd

3 files changed, 12 insertions, 16 deletions

diff --git a/scripts/enable-ibus-test b/scripts/enable-ibus-test
index d95e296..50c3cba 100755
--- a/scripts/enable-ibus-test
+++ b/scripts/enable-ibus-test
@@ -13,13 +13,6 @@ if [[ "$previous" != "parley" ]]; then
     printf '%s\n' "$previous" > "$state_dir/previous-ibus-engine"
 fi
 
-systemctl --user start parley-ibus.service
-for _ in {1..20}; do
-    busctl --user --quiet list 2>/dev/null | grep -q '^org.parley.IBus1 ' && break
-    sleep 0.1
-done
-ibus engine parley >/dev/null 2>&1 || [[ $(ibus engine) == parley ]]
-
 cat > "$dropin_dir/ibus-test.conf" <<'EOF'
 [Service]
 Environment=PARLEY_AUTO_INSERT=1
@@ -28,4 +21,14 @@ EOF
 systemctl --user daemon-reload
 systemctl --user restart parley.service
 
+for _ in {1..20}; do
+    ibus engine parley >/dev/null 2>&1 || true
+    [[ $(ibus engine 2>/dev/null || true) == parley ]] && break
+    sleep 0.1
+done
+[[ $(ibus engine 2>/dev/null || true) == parley ]] || {
+    echo "could not select the Parley IBus engine" >&2
+    exit 1
+}
+
 echo "Parley IBus test mode enabled (previous engine: $previous)"
diff --git a/scripts/install-dev b/scripts/install-dev
index c5afea9..d21bc46 100755
--- a/scripts/install-dev
+++ b/scripts/install-dev
@@ -11,14 +11,12 @@ cd "$root"
 mkdir -p "$unit_dir" "$dbus_dir"
 sed "s|^ExecStart=.*|ExecStart=$root/scripts/parleyd|" \
   data/systemd/parley.service > "$unit_dir/parley.service"
-sed "s|^ExecStart=.*|ExecStart=$root/scripts/parley-ibus|" \
-  data/systemd/parley-ibus.service > "$unit_dir/parley-ibus.service"
 install -m644 data/dbus/org.parley.Transcription1.service \
   "$dbus_dir/org.parley.Transcription1.service"
 
 systemctl --user daemon-reload
-systemctl --user enable parley.service parley-ibus.service
-systemctl --user restart parley.service parley-ibus.service
+systemctl --user enable parley.service
+systemctl --user restart parley.service
 
 echo "Installed local development service from $root"
 echo "Run: $root/scripts/parleyctl status"
diff --git a/scripts/parley-ibus b/scripts/parley-ibus
deleted file mode 100755
index 22ca2c1..0000000
--- a/scripts/parley-ibus
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-root=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
-export PYTHONPATH="$root/src${PYTHONPATH:+:$PYTHONPATH}"
-exec /usr/bin/python -m parley.ibus_engine "$@"