at master 70 lines 3.4 kB view raw
1diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py 2index 60c172f78..e8dadf76d 100644 3--- a/src/orca/ax_utilities_application.py 4+++ b/src/orca/ax_utilities_application.py 5@@ -189,7 +189,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 Exception 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 740f1a690..85f74d2dc 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 Exception 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 6cb4c7772..903b344f0 100755 29--- a/src/orca/orca_bin.py.in 30+++ b/src/orca/orca_bin.py.in 31@@ -186,7 +186,7 @@ def inGraphicalDesktop(): 32 def otherOrcas(): 33 """Returns the pid of any other instances of Orca owned by this user.""" 34 35- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), 36+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), 37 shell=True, 38 stdout=subprocess.PIPE).stdout 39 pids = openFile.read() 40diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py 41index 3407be009..452297a3f 100644 42--- a/src/orca/orca_modifier_manager.py 43+++ b/src/orca/orca_modifier_manager.py 44@@ -230,7 +230,7 @@ class OrcaModifierManager: 45 debug.print_message(debug.LEVEL_INFO, msg, True) 46 47 self.unset_orca_modifiers(reason) 48- with subprocess.Popen(["xkbcomp", os.environ["DISPLAY"], "-"], 49+ with subprocess.Popen(["@xkbcomp@", os.environ["DISPLAY"], "-"], 50 stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as p: 51 self._original_xmodmap, _ = p.communicate() 52 self._create_orca_xmodmap() 53@@ -262,7 +262,7 @@ class OrcaModifierManager: 54 return 55 56 self._caps_lock_cleared = False 57- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]], 58+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]], 59 stdin=subprocess.PIPE, stdout=None, stderr=None) as p: 60 p.communicate(self._original_xmodmap) 61 62@@ -325,7 +325,7 @@ class OrcaModifierManager: 63 debug.print_message(debug.LEVEL_INFO, msg, True) 64 65 66- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]], 67+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]], 68 stdin=subprocess.PIPE, stdout=None, stderr=None) as p: 69 p.communicate(bytes('\n'.join(lines), 'UTF-8')) 70 else: