tjh.dev
1diff --git a/src/orca/debug.py b/src/orca/debug.py
2index e79482ed4..cbf3a24ec 100644
3--- a/src/orca/debug.py
4+++ b/src/orca/debug.py
5@@ -502,7 +502,7 @@ def traceit(frame, event, arg):
6 return traceit
7
8 def getOpenFDCount(pid):
9- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)])
10+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)])
11 procs = procs.decode('UTF-8').split('\n')
12 files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
13
14@@ -510,7 +510,7 @@ def getOpenFDCount(pid):
15
16 def getCmdline(pid):
17 try:
18- openFile = os.popen('cat /proc/%s/cmdline' % pid)
19+ openFile = os.popen('@cat@ /proc/%s/cmdline' % pid)
20 cmdline = openFile.read()
21 openFile.close()
22 except:
23@@ -520,7 +520,7 @@ def getCmdline(pid):
24 return cmdline
25
26 def pidOf(procName):
27- openFile = subprocess.Popen('pgrep %s' % procName,
28+ openFile = subprocess.Popen('@pgrep@ %s' % procName,
29 shell=True,
30 stdout=subprocess.PIPE).stdout
31 pids = openFile.read()
32diff --git a/src/orca/orca.py b/src/orca/orca.py
33index 2fe0a0bf2..087526556 100644
34--- a/src/orca/orca.py
35+++ b/src/orca/orca.py
36@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent):
37
38 def _setXmodmap(xkbmap):
39 """Set the keyboard map using xkbcomp."""
40- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
41+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
42 stdin=subprocess.PIPE, stdout=None, stderr=None)
43 p.communicate(xkbmap)
44
45@@ -363,7 +363,7 @@ def _storeXmodmap(keyList):
46 """
47
48 global _originalXmodmap
49- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-'])
50+ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-'])
51
52 def _restoreXmodmap(keyList=[]):
53 """Restore the original xmodmap values for the keys in keyList.
54@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]):
55
56 global _capsLockCleared
57 _capsLockCleared = False
58- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
59+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
60 stdin=subprocess.PIPE, stdout=None, stderr=None)
61 p.communicate(_originalXmodmap)
62
63diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
64index 8c9d40153..eec0d5437 100644
65--- a/src/orca/orca_bin.py.in
66+++ b/src/orca/orca_bin.py.in
67@@ -62,7 +62,7 @@ class ListApps(argparse.Action):
68 name = "[DEAD]"
69
70 try:
71- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid)
72+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid)
73 except:
74 cmdline = '(exception encountered)'
75 else:
76@@ -197,7 +197,7 @@ def inGraphicalDesktop():
77 def otherOrcas():
78 """Returns the pid of any other instances of Orca owned by this user."""
79
80- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
81+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
82 shell=True,
83 stdout=subprocess.PIPE).stdout
84 pids = openFile.read()