Merge pull request #1396 from jchodera/fix-packaging-scripts

Update packaging preparation scripts

devtools/packaging/scripts/linux/prepare.sh

-#!/bin/tcsh
+#!/bin/bash
 
 # Prepare for build by ensuring necessary prerequisites are locally installed.
 
@@ -15,7 +15,7 @@ then
    echo "miniconda already exists"
 else
    echo "Downloading miniconda..."
-   rm -rf Miniconda-*
+   rm -rf Miniconda-* miniconda ~/.condarc
    wget --quiet http://repo.continuum.io/miniconda/${MINICONDA}
    bash ${MINICONDA} -b -p miniconda
    PIP_ARGS="-U"
@@ -25,6 +25,6 @@ fi
 export PATH=$WORKSPACE/miniconda/bin:$PATH
 
 # Ensure configuration is up to date.
-conda config --add channels http://conda.binstar.org/omnia
-conda install --yes --quiet swig fftw3f pip
-pip install sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen
+conda config --add channels omnia
+conda install --yes --quiet swig fftw3f pip doxygen sphinx sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen lxml cmake
+

devtools/packaging/scripts/source/prepare.sh

-#!/bin/tcsh
+#!/bin/bash
 
 # Prepare for build by ensuring necessary prerequisites are locally installed.
 
 # Set relative workspace path.
 export WORKSPACE=`pwd`
 
+
 # Install miniconda
-export VERSION="Latest"
+export VERSION="latest"
 export PLATFORM="Linux"
 export ARCH="x86_64"
-export MINICONDA="Miniconda-$VERSION-$PLATFORM-$ARCH.sh"
+export MINICONDA="Miniconda2-$VERSION-$PLATFORM-$ARCH.sh"
 if [ -f miniconda ];
 then
    echo "miniconda already exists"
 else
    echo "Downloading miniconda..."
-   rm -rf Miniconda-*
+   rm -rf Miniconda-* miniconda ~/.condarc
    wget --quiet http://repo.continuum.io/miniconda/${MINICONDA}
    bash ${MINICONDA} -b -p miniconda
    PIP_ARGS="-U"
@@ -25,6 +26,6 @@ fi
 export PATH=$WORKSPACE/miniconda/bin:$PATH
 
 # Ensure configuration is up to date.
-conda config --add channels http://conda.binstar.org/omnia
-conda install --yes --quiet swig fftw3f pip
-pip install sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen
+conda config --add channels omnia
+conda install --yes --quiet swig fftw3f pip doxygen sphinx sphinxcontrib-bibtex sphinxcontrib-lunrsearch sphinxcontrib-autodoc_doxygen lxml cmake
+