Merge pull request #45 from jhoblitt/tickets/DM-10587-csh

fix newinstall.sh csh support

.travis.yml

@@ -1,4 +1,3 @@
-sudo: false
 language: cpp
 os:
   - linux
@@ -9,6 +8,10 @@ dist: trusty
 compiler:
   - clang
   - gcc
+addons:
+  apt:
+    packages:
+    - tcsh
 script: |
   set -e
   if [[ $BATCH == true ]]; then
@@ -18,13 +21,25 @@ script: |
     echo -e "*** testing interactive mode in Python version $PYVER ***\n"
     echo -e "yes\nyes" | bash -x ./scripts/newinstall.sh -c -${PYVER}
   fi
-  echo -e "*** Initialising bash environment **\n"
-  source loadLSST.bash
+  echo -e "*** Testing initializaion of shell environment ***\n"
+  case $MANGLER in
+    tcsh)
+      # csh_20110502-2ubuntu2_amd64.deb from ubuntu:trusty (travis) opens a new
+      # shell interactive shell when passed--version
+      tcsh --version
+      tcsh -ec 'source loadLSST.csh && echo $EUPS_PKGROOT'
+      ;;
+    *)
+      bash --version
+      bash -ec 'source loadLSST.bash && echo $EUPS_PKGROOT'
+      ;;
+  esac
 env:
   - BATCH=true PYVER="2"
   - BATCH=true PYVER="3"
   - BATCH=false PYVER="2"
   - BATCH=false PYVER="3"
+  - MANGLER=tcsh BATCH=true PYVER="3"
 matrix:
   # osx builds are often very slow to start due to high demand
   fast_finish: true

scripts/newinstall.sh

@@ -545,7 +545,7 @@ bootstrap_miniconda() {
 	miniconda::lsst_env "$LSST_PYTHON_VERSION" "$LSSTSW_REF"
 
 	CMD_SETUP_MINICONDA_SH="export PATH=\"${miniconda_path}/bin:\${PATH}\""
-	CMD_SETUP_MINICONDA_CSH="setenv PATH ${miniconda_path}/bin:\$PATH)"
+	CMD_SETUP_MINICONDA_CSH="setenv PATH ${miniconda_path}/bin:\$PATH"
 }
 
 #
@@ -646,23 +646,19 @@ generate_loader_csh() {
 		# Setup optional packages
 		${CMD_SETUP_MINICONDA_CSH}
 
-		set sourced=(\$_)
-		if ("\${sourced}" != "") then
-			 # If not already initialized, set LSST_HOME to the directory where this
-			 # script is located
-		   set this_script = \${sourced[2]}
-		   if ( ! \${?LSST_HOME} ) then
-		     set LSST_HOME = \`dirname \${this_script}\`
-		     set LSST_HOME = \`cd \${LSST_HOME} && pwd\`
-		   endif
-
-		   # Bootstrap EUPS
-		   set EUPS_DIR = "\${LSST_HOME}/eups"
-		   source "\${EUPS_DIR}/bin/setups.csh"
-
-		   if ( ! \${?EUPS_PKGROOT} ) then
-		     set EUPS_PKGROOT = "$EUPS_PKGROOT"
-		   endif
+		# If not already initialized, set LSST_HOME to the directory where this
+		# script is located
+		if ( ! \${?LSST_HOME} ) then
+		  set LSST_HOME = \`dirname \$0\`
+		  set LSST_HOME = \`cd \${LSST_HOME} && pwd\`
+		endif
+
+		# Bootstrap EUPS
+		set EUPS_DIR = "\${LSST_HOME}/eups"
+		source "\${EUPS_DIR}/bin/setups.csh"
+
+		if ( ! \${?EUPS_PKGROOT} ) then
+		  setenv EUPS_PKGROOT "$EUPS_PKGROOT"
 		endif
 	EOF
 }