summarylogtreecommitdiffstats
path: root/eman2-installer
diff options
context:
space:
mode:
Diffstat (limited to 'eman2-installer')
-rwxr-xr-xeman2-installer16
1 files changed, 11 insertions, 5 deletions
diff --git a/eman2-installer b/eman2-installer
index 8254f7181222..b3982b335125 100755
--- a/eman2-installer
+++ b/eman2-installer
@@ -9,7 +9,7 @@
# Date: 9/1/2009, --disable_cache, Grant Tang
# Date: 6/30/2013, Significant updates by Ian Rees for new build system.
# Date: 8/01/2013, changed disable_cache to disable_gui
-
+# Date: 1/23/2017, altered eman2.[bashrc/cshrc] files to include new matplotlibrc file in extlib
usage()
{
echo "usage: `basename $0` [--disable_gui]"
@@ -34,8 +34,11 @@ setup_shell() {
echo "Unkown shell. You will need set up your enviroment variables manually."
fi
if test "X${RCFILE}" != "X"; then
- echo "Please add the following line to the end of your ${HOME}/${RCFILE} :"
- echo "source ${EMAN2DIR}/eman2${RCFILE}"
+ #echo "Please add the following line to the end of your ${HOME}/${RCFILE} :"
+ #echo "source ${EMAN2DIR}/eman2${RCFILE}"
+ #echo ""
+ #echo "If you experience any problems after installation, please see for tips:"
+ #echo "http:/eman2.org/Install/BinaryInstall"
fi
}
@@ -48,6 +51,7 @@ setup_csh() {
echo 'else' >> ${OUT}
echo ' setenv PYTHONPATH ${EMAN2DIR}/lib:${EMAN2DIR}/bin:${PYTHONPATH}' >> ${OUT}
echo 'endif' >> ${OUT}
+ echo 'setenv MATPLOTLIBRC ${EMAN2DIR}/extlib' >> ${OUT}
echo 'alias sparx sx.py' >> ${OUT}
echo "setenv LC_CTYPE=en_US.utf8"
echo "setenv LC_ALL=en_US.utf8"
@@ -59,8 +63,10 @@ setup_bash()
echo "export EMAN2DIR=${EMAN2DIR}" > ${OUT}
echo 'export PATH=${EMAN2DIR}/bin:${EMAN2DIR}/extlib/bin:$PATH' >> ${OUT}
echo 'export PYTHONPATH=${EMAN2DIR}/lib:${EMAN2DIR}/bin:${PYTHONPATH}' >> ${OUT}
+ echo 'export MATPLOTLIBRC=${EMAN2DIR}/extlib' >> ${OUT}
echo 'export LC_CTYPE=en_US.utf8'
echo 'export LC_ALL=en_US.utf8'
+ echo 'alias sphire=sxgui.py' >> ${OUT}
echo 'alias sparx=sx.py' >> ${OUT}
}
@@ -69,9 +75,9 @@ setup_python()
EMAN2PYTHON=$1
# Update python interpreter
find ${EMAN2DIR}/extlib/bin -name "ipython" \
- -exec sed -i "s%^\#\!.*python.*$%\#\!/opt/eman2/extlib/bin/python%" {} \;
+ -exec sed -i "s%^\#\!.*python.*$%\#\!$/opt/eman2/extlib/bin/python%" {} \;
find ${EMAN2DIR}/test ${EMAN2DIR}/bin ${EMAN2DIR}/lib ${EMAN2DIR}/examples -name "*.py" \
- -exec sed -i "s%^\#\!.*python.*$%\#\!/opt/eman2/extlib/bin/python%" {} \;
+ -exec sed -i "s%^\#\!.*python.*$%\#\!$/opt/eman2/extlib/bin/python%" {} \;
find ${EMAN2DIR}/test ${EMAN2DIR}/bin ${EMAN2DIR}/lib ${EMAN2DIR}/examples -name "*.py" \
-exec chmod a+x {} \;
# ... and for SPARX