Merge pull request #24 from scipion-em/csh

fix csh installation with conda

CHANGES.txt

@@ -1,3 +1,3 @@
-
+1.0.10 - fix csh/tcsh installations
 19-December-2019 - First version of the scipion installer
 

scipioninstaller/__init__.py

@@ -1,2 +1,2 @@
 INSTALL_ENTRY = 'installscipion'
-__version__ = '1.0.9'
+__version__ = '1.0.10'

scipioninstaller/installer.py

@@ -62,11 +62,18 @@ def getCondaCmd(scipionEnv, noAsk):
 
 def getCondaInitCmd():
     shell = os.path.basename(os.environ.get("SHELL", "bash"))
-    return 'eval "$(%s shell.%s hook)"' % (checkProgram(CONDA), shell)
+    if shell in ["csh", "tcsh"]:
+        return 'set cinit="`%s shell.%s hook`" && eval "$cinit"' % (checkProgram(CONDA), shell)
+    else:
+        return 'eval "$(%s shell.%s hook)"' % (checkProgram(CONDA), shell)
 
 
 def getCondaenvActivationCmd(scipionEnv):
-    return "conda activate %s" % scipionEnv
+    shell = os.path.basename(os.environ.get("SHELL", "bash"))
+    if shell in ["csh", "tcsh"]:
+        return 'set cact="`%s shell.%s activate %s`" && eval "$cact"' % (checkProgram(CONDA), shell, scipionEnv)
+    else:
+        return "conda activate %s" % scipionEnv
 
 
 def cmdfy(cmd, sep=CMD_SEP):