tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py
2index dbaca2e48..80f2640d4 100644
3--- a/src/orca/ax_utilities_application.py
4+++ b/src/orca/ax_utilities_application.py
5@@ -188,7 +188,7 @@ class AXUtilitiesApplication:
6
7 pid = AXUtilitiesApplication.get_process_id(app)
8 try:
9- state = subprocess.getoutput(f"cat /proc/{pid}/status | grep State")
10+ state = subprocess.getoutput(f"@cat@ /proc/{pid}/status | @grep@ State")
11 state = state.split()[1]
12 except (GLib.GError, IndexError) as error:
13 tokens = [f"AXUtilitiesApplication: Exception checking state of pid {pid}: {error}"]
14diff --git a/src/orca/debugging_tools_manager.py b/src/orca/debugging_tools_manager.py
15index b4abce719..cff5a78a6 100644
16--- a/src/orca/debugging_tools_manager.py
17+++ b/src/orca/debugging_tools_manager.py
18@@ -243,7 +243,7 @@ class DebuggingToolsManager:
19 else:
20 name = AXObject.get_name(app) or "[DEAD]"
21 try:
22- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline")
23+ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline")
24 except subprocess.SubprocessError as error:
25 cmdline = f"EXCEPTION: {error}"
26 else:
27diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
28index 3fc845dc3..a82947911 100755
29--- a/src/orca/orca_bin.py.in
30+++ b/src/orca/orca_bin.py.in
31@@ -238,7 +238,7 @@ def in_graphical_desktop() -> bool:
32 def other_orcas() -> list[int]:
33 """Returns the pid of any other instances of Orca owned by this user."""
34
35- with subprocess.Popen(f"pgrep -u {os.getuid()} -x orca",
36+ with subprocess.Popen(f"@pgrep@ -u {os.getuid()} -x orca",
37 shell=True,
38 stdout=subprocess.PIPE) as proc:
39 pids = proc.stdout.read() if proc.stdout else b""
40diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py
41index 098b0a033..e7b040d82 100644
42--- a/src/orca/orca_modifier_manager.py
43+++ b/src/orca/orca_modifier_manager.py
44@@ -236,7 +236,7 @@ class OrcaModifierManager:
45 return
46
47 self.unset_orca_modifiers(reason)
48- with subprocess.Popen(["xkbcomp", display, "-"],
49+ with subprocess.Popen(["@xkbcomp@", display, "-"],
50 stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as p:
51 self._original_xmodmap, _ = p.communicate()
52 self._create_orca_xmodmap()
53@@ -274,7 +274,7 @@ class OrcaModifierManager:
54 return
55
56 self._caps_lock_cleared = False
57- with subprocess.Popen(["xkbcomp", "-w0", "-", display],
58+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", display],
59 stdin=subprocess.PIPE, stdout=None, stderr=None) as p:
60 p.communicate(self._original_xmodmap)
61
62@@ -349,7 +349,7 @@ class OrcaModifierManager:
63 debug.print_message(debug.LEVEL_INFO, msg, True)
64
65
66- with subprocess.Popen(["xkbcomp", "-w0", "-", display],
67+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", display],
68 stdin=subprocess.PIPE, stdout=None, stderr=None) as p:
69 p.communicate(bytes('\n'.join(lines), 'UTF-8'))
70 else: