71 lines
3.3 KiB
Diff
71 lines
3.3 KiB
Diff
|
diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py
|
||
|
|
index 60c172f78..e8dadf76d 100644
|
||
|
|
--- a/src/orca/ax_utilities_application.py
|
||
|
|
+++ b/src/orca/ax_utilities_application.py
|
||
|
|
@@ -189,7 +189,7 @@ class AXUtilitiesApplication:
|
||
|
|
|
||
|
|
pid = AXUtilitiesApplication.get_process_id(app)
|
||
|
|
try:
|
||
|
|
- state = subprocess.getoutput(f"cat /proc/{pid}/status | grep State")
|
||
|
|
+ state = subprocess.getoutput(f"@cat@ /proc/{pid}/status | @grep@ State")
|
||
|
|
state = state.split()[1]
|
||
|
|
except Exception as error:
|
||
|
|
tokens = [f"AXUtilitiesApplication: Exception checking state of pid {pid}: {error}"]
|
||
|
|
diff --git a/src/orca/debugging_tools_manager.py b/src/orca/debugging_tools_manager.py
|
||
|
|
index 740f1a690..85f74d2dc 100644
|
||
|
|
--- a/src/orca/debugging_tools_manager.py
|
||
|
|
+++ b/src/orca/debugging_tools_manager.py
|
||
|
|
@@ -243,7 +243,7 @@ class DebuggingToolsManager:
|
||
|
|
else:
|
||
|
|
name = AXObject.get_name(app) or "[DEAD]"
|
||
|
|
try:
|
||
|
|
- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline")
|
||
|
|
+ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline")
|
||
|
|
except Exception as error:
|
||
|
|
cmdline = f"EXCEPTION: {error}"
|
||
|
|
else:
|
||
|
|
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
|
||
|
|
index 6cb4c7772..903b344f0 100755
|
||
|
|
--- a/src/orca/orca_bin.py.in
|
||
|
|
+++ b/src/orca/orca_bin.py.in
|
||
|
|
@@ -186,7 +186,7 @@ def inGraphicalDesktop():
|
||
|
|
def otherOrcas():
|
||
|
|
"""Returns the pid of any other instances of Orca owned by this user."""
|
||
|
|
|
||
|
|
- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
|
||
|
|
+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
|
||
|
|
shell=True,
|
||
|
|
stdout=subprocess.PIPE).stdout
|
||
|
|
pids = openFile.read()
|
||
|
|
diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py
|
||
|
|
index 3407be009..452297a3f 100644
|
||
|
|
--- a/src/orca/orca_modifier_manager.py
|
||
|
|
+++ b/src/orca/orca_modifier_manager.py
|
||
|
|
@@ -230,7 +230,7 @@ class OrcaModifierManager:
|
||
|
|
debug.print_message(debug.LEVEL_INFO, msg, True)
|
||
|
|
|
||
|
|
self.unset_orca_modifiers(reason)
|
||
|
|
- with subprocess.Popen(["xkbcomp", os.environ["DISPLAY"], "-"],
|
||
|
|
+ with subprocess.Popen(["@xkbcomp@", os.environ["DISPLAY"], "-"],
|
||
|
|
stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as p:
|
||
|
|
self._original_xmodmap, _ = p.communicate()
|
||
|
|
self._create_orca_xmodmap()
|
||
|
|
@@ -262,7 +262,7 @@ class OrcaModifierManager:
|
||
|
|
return
|
||
|
|
|
||
|
|
self._caps_lock_cleared = False
|
||
|
|
- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]],
|
||
|
|
+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]],
|
||
|
|
stdin=subprocess.PIPE, stdout=None, stderr=None) as p:
|
||
|
|
p.communicate(self._original_xmodmap)
|
||
|
|
|
||
|
|
@@ -325,7 +325,7 @@ class OrcaModifierManager:
|
||
|
|
debug.print_message(debug.LEVEL_INFO, msg, True)
|
||
|
|
|
||
|
|
|
||
|
|
- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]],
|
||
|
|
+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]],
|
||
|
|
stdin=subprocess.PIPE, stdout=None, stderr=None) as p:
|
||
|
|
p.communicate(bytes('\n'.join(lines), 'UTF-8'))
|
||
|
|
else:
|