fix _CONDA_ROOT and install scripts for other shells

2 files changed, 10 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a69539eddf6a..5a65ca33186f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Feb 18 23:22:33 UTC 2018
+# Tue Feb 20 18:56:19 UTC 2018
 pkgbase = python-conda
 	pkgdesc = OS-agnostic, system-level binary package manager and ecosystem
 	pkgver = 4.4.10
-	pkgrel = 1
+	pkgrel = 2
 	url = http://conda.pydata.org/docs/
 	arch = any
 	license = BSD
diff --git a/PKGBUILD b/PKGBUILD
index a216001a897b..85dfa71d3c04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pyname=conda
 pkgname=python-conda
 pkgver=4.4.10
-pkgrel=1
+pkgrel=2
 pkgdesc="OS-agnostic, system-level binary package manager and ecosystem"
 arch=('any')
 url="http://conda.pydata.org/docs/"
@@ -21,7 +21,7 @@ sha512sums=('935745439bfdc0c485e7575e34042768e26a87649994869cfada51fa2c6ecc28124
 
 prepare() {
   cd "$srcdir/${_pyname}-$pkgver"
-  sed -i "1s/.*/set _CONDA_EXE \/usr\/bin\/conda/" conda/shell/etc/fish/conf.d/conda.fish
+  sed -i 's/$_CONDA_ROOT//' conda/shell/bin/{de,}activate
 }
 
 package() {
@@ -31,7 +31,12 @@ package() {
   install -Dm 655 conda/shell/bin/activate $pkgdir/usr/bin/activate
   install -Dm 655 conda/shell/bin/conda $pkgdir/usr/bin/conda
   install -Dm 655 conda/shell/bin/deactivate $pkgdir/usr/bin/deactivate
-  install -Dm 644 conda/shell/etc/fish/conf.d/conda.fish $pkgdir/etc/fish/conf.d/conda.fish
+  echo 'set _CONDA_EXE=/usr/bin/conda' | cat - conda/shell/etc/fish/conf.d/conda.fish > conda.fish
+  install -Dm 644 conda.fish $pkgdir/etc/fish/conf.d/conda.fish
+  echo 'set _CONDA_EXE=/usr/bin/conda' | cat - conda/shell/etc/profile.d/conda.csh > conda.csh
+  install -Dm 644 conda.csh $pkgdir/etc/profile.d/conda.csh
+  echo 'export _CONDA_EXE=/usr/bin/conda' | cat - conda/shell/etc/profile.d/conda.sh > conda.sh
+  install -Dm 644 conda.sh $pkgdir/etc/profile.d/conda.sh
   install -Dm 644 LICENSE.txt $pkgdir/usr/share/licenses/${pkgname}/LICENSE.txt
 }