|
 |
fd9a929 |
From 707d687c031058134619231d9c05037487859d10 Mon Sep 17 00:00:00 2001
|
|
|
fd9a929 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
fd9a929 |
Date: Sat, 3 Aug 2019 13:42:20 +0200
|
|
|
fd9a929 |
Subject: [PATCH] shell: assume shell plugins are in /etc/
|
|
|
fd9a929 |
|
|
|
fd9a929 |
---
|
|
|
fd9a929 |
conda/activate.py | 9 ++++-----
|
|
|
fd9a929 |
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
fd9a929 |
|
|
|
fd9a929 |
diff --git a/conda/activate.py b/conda/activate.py
|
|
|
fd9a929 |
index 39296b1a18..8173e49abc 100644
|
|
|
fd9a929 |
--- a/conda/activate.py
|
|
|
fd9a929 |
+++ b/conda/activate.py
|
|
|
fd9a929 |
@@ -750,7 +750,7 @@ class PosixActivator(_Activator):
|
|
|
fd9a929 |
self.set_var_tmpl = "%s='%s'"
|
|
|
fd9a929 |
self.run_script_tmpl = '. "%s"'
|
|
|
fd9a929 |
|
|
|
fd9a929 |
- self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'profile.d', 'conda.sh')
|
|
|
fd9a929 |
+ self.hook_source_path = '/etc/profile.d/conda.sh'
|
|
|
fd9a929 |
|
|
|
fd9a929 |
super(PosixActivator, self).__init__(arguments)
|
|
|
fd9a929 |
|
|
|
fd9a929 |
@@ -802,7 +802,7 @@ class CshActivator(_Activator):
|
|
|
fd9a929 |
self.set_var_tmpl = "set %s='%s'"
|
|
|
fd9a929 |
self.run_script_tmpl = 'source "%s"'
|
|
|
fd9a929 |
|
|
|
fd9a929 |
- self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'profile.d', 'conda.csh')
|
|
|
fd9a929 |
+ self.hook_source_path = '/etc/profile.d/conda.csh'
|
|
|
fd9a929 |
|
|
|
fd9a929 |
super(CshActivator, self).__init__(arguments)
|
|
|
fd9a929 |
|
|
|
fd9a929 |
@@ -846,7 +846,7 @@ class XonshActivator(_Activator):
|
|
|
fd9a929 |
self.set_var_tmpl = "$%s = '%s'" # TODO: determine if different than export_var_tmpl
|
|
|
fd9a929 |
self.run_script_tmpl = 'source "%s"'
|
|
|
fd9a929 |
|
|
|
fd9a929 |
- self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'conda.xsh')
|
|
|
fd9a929 |
+ self.hook_source_path = '/etc/profile.d/conda.xsh'
|
|
|
fd9a929 |
|
|
|
fd9a929 |
super(XonshActivator, self).__init__(arguments)
|
|
|
fd9a929 |
|
|
|
fd9a929 |
@@ -895,8 +895,7 @@ class FishActivator(_Activator):
|
|
|
fd9a929 |
self.set_var_tmpl = 'set -g %s "%s"'
|
|
|
fd9a929 |
self.run_script_tmpl = 'source "%s"'
|
|
|
fd9a929 |
|
|
|
fd9a929 |
- self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'fish', 'conf.d',
|
|
|
fd9a929 |
- 'conda.fish')
|
|
|
fd9a929 |
+ self.hook_source_path = '/etc/fish/conf.d/conda.fish'
|
|
|
fd9a929 |
|
|
|
fd9a929 |
super(FishActivator, self).__init__(arguments)
|
|
|
fd9a929 |
|