1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
cola/app.py | 4 ++--
setup.py | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/cola/app.py b/cola/app.py
index bc7906a..972eaa7 100644
--- a/cola/app.py
+++ b/cola/app.py
@@ -65,9 +65,9 @@ def setup_environment():
elif ssh_askpass:
askpass = ssh_askpass
elif sys.platform == 'darwin':
- askpass = resources.share('bin', 'ssh-askpass-darwin')
+ askpass = resources.prefix('bin', 'ssh-askpass-darwin')
else:
- askpass = resources.share('bin', 'ssh-askpass')
+ askpass = resources.prefix('bin', 'ssh-askpass')
compat.putenv('GIT_ASKPASS', askpass)
compat.putenv('SSH_ASKPASS', askpass)
diff --git a/setup.py b/setup.py
index e202edc..81765a1 100755
--- a/setup.py
+++ b/setup.py
@@ -101,10 +101,6 @@ def cola_data_files():
data.extend([_app_path(localedir, 'git-cola.mo')
for localedir in glob('share/locale/*/LC_MESSAGES')])
- if sys.platform == 'darwin':
- data.append(_app_path('share/git-cola/bin', 'ssh-askpass-darwin'))
- else:
- data.append(_app_path('share/git-cola/bin', 'ssh-askpass'))
return data
|
GitWeb
