Blob Blame History Raw
From 707d687c031058134619231d9c05037487859d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 3 Aug 2019 13:42:20 +0200
Subject: [PATCH] shell: assume shell plugins are in /etc/

---
 conda/activate.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/conda/activate.py b/conda/activate.py
index 39296b1a18..8173e49abc 100644
--- a/conda/activate.py
+++ b/conda/activate.py
@@ -750,7 +750,7 @@ class PosixActivator(_Activator):
         self.set_var_tmpl = "%s='%s'"
         self.run_script_tmpl = '. "%s"'
 
-        self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'profile.d', 'conda.sh')
+        self.hook_source_path = '/etc/profile.d/conda.sh'
 
         super(PosixActivator, self).__init__(arguments)
 
@@ -802,7 +802,7 @@ class CshActivator(_Activator):
         self.set_var_tmpl = "set %s='%s'"
         self.run_script_tmpl = 'source "%s"'
 
-        self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'profile.d', 'conda.csh')
+        self.hook_source_path = '/etc/profile.d/conda.csh'
 
         super(CshActivator, self).__init__(arguments)
 
@@ -846,7 +846,7 @@ class XonshActivator(_Activator):
         self.set_var_tmpl = "$%s = '%s'"  # TODO: determine if different than export_var_tmpl
         self.run_script_tmpl = 'source "%s"'
 
-        self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'conda.xsh')
+        self.hook_source_path = '/etc/profile.d/conda.xsh'
 
         super(XonshActivator, self).__init__(arguments)
 
@@ -895,8 +895,7 @@ class FishActivator(_Activator):
         self.set_var_tmpl = 'set -g %s "%s"'
         self.run_script_tmpl = 'source "%s"'
 
-        self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'fish', 'conf.d',
-                                     'conda.fish')
+        self.hook_source_path = '/etc/fish/conf.d/conda.fish'
 
         super(FishActivator, self).__init__(arguments)