From 23e06b1d76c44113be9fbed050f7be013f446029 Mon Sep 17 00:00:00 2001
From: jemian <jemian@anl.gov>
Date: Wed, 14 Dec 2016 15:03:07 -0600
Subject: [PATCH 1/3] Add new file

---
 install-oasys.sh | 121 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 install-oasys.sh

diff --git a/install-oasys.sh b/install-oasys.sh
new file mode 100644
index 0000000..d5b4cb9
--- /dev/null
+++ b/install-oasys.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+# Installs ShadowOui into Linux home directory as "ShadowOui"
+# support is only for Linux at this time
+
+# assume these things are already installed
+# bash
+# git
+# compilers: C, C++, FORTRAN
+# OpenGL and development package (header files)
+# libGLU and development package (header files)
+
+
+echo "#----------> Downloading Miniconda installer"
+#export SHADOWOUI_HOME=$HOME/ShadowOui
+export SHADOWOUI_HOME=$HOME/Oasys_Application
+mkdir -p $SHADOWOUI_HOME
+cd $SHADOWOUI_HOME
+wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+
+echo "#----------> Installing Miniconda and Python3 into $SHADOWOUI_HOME"
+bash miniconda.sh -b -p $SHADOWOUI_HOME/x86_64
+export PATH=$SHADOWOUI_HOME/x86_64/bin:$PATH
+
+echo `which python`
+echo `which pip`
+echo `which conda`
+
+export PYTHON_SITE_PACKAGES=`python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
+
+echo "#----------> Updating Python3 packages"
+conda update --yes conda pip
+
+echo "#----------> Installing additional pre-built packages"
+conda install --yes \
+	pyqt=4 \
+	numpy \
+	scipy \
+	matplotlib=1.4.3 \
+	python-dateutil \
+	pytz \
+	pyparsing \
+	nose \
+	swig
+
+
+# xraylib
+echo "#----------> Installing Oasys dependency xraylib"
+curl -O http://lvserver.ugent.be/xraylib/xraylib-3.2.0.tar.gz
+tar xvfz xraylib-3.2.0.tar.gz
+cd xraylib-3.2.0
+./configure --enable-python --enable-python-integration PYTHON=`which python`
+make
+cp python/.libs/_xraylib.so  $PYTHON_SITE_PACKAGES
+cp python/xrayhelp.py $PYTHON_SITE_PACKAGES
+cp python/xraylib.py $PYTHON_SITE_PACKAGES
+cp python/xraymessages.py  $PYTHON_SITE_PACKAGES
+cd ..
+
+
+# srxraylib
+echo "#----------> Installing Oasys dependency srxraylib"
+git clone https://github.com/lucarebuffi/srxraylib
+cd srxraylib
+python setup.py develop
+cd ..
+
+
+#shadow3
+echo "#----------> Installing Oasys dependency shadow3"
+git clone https://github.com/srio/shadow3
+cd shadow3
+python setup.py build
+python setup.py develop
+cd ..
+
+
+# fisx
+echo "#----------> Installing pymca dependency fisx"
+git clone https://github.com/vasole/fisx
+cd fisx
+python setup.py install
+cd ..
+
+
+#pymca
+echo "#----------> Installing Oasys dependency pymca"
+pip install PyMca5
+# git clone https://github.com/vasole/pymca
+# cd pymca
+# python setup.py install
+# cd ..
+
+
+echo "#----------> Installing Oasys..."
+pip install oasys
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+echo "#----------> Configuring script to run OASYS & ShadowOui..."
+export SCRIPT=$SHADOWOUI_HOME/start_oasys_shadowoui.sh
+
+cmd="#\x21/bin/bash"
+cmd+="\n\n"
+cmd+="$SHADOWOUI_HOME/x86_64/bin/python -m oasys.canvas &"
+echo -e $cmd > $SCRIPT
+chmod +x $SCRIPT
+
+echo ""
+echo ""
+echo "#---------------------------"
+echo ""
+echo "Instructions"
+echo "============"
+echo ""
+echo "start ShadowOui with this command: $SCRIPT"
+echo "click on Add-Ons"
+echo "check next to ShadowOui (options: OASYS-XRayServer & OASYS-XOPPY)"
+echo "click OK button"
+echo "wait for installation"
+echo "restart oasys"
-- 
GitLab


From cb02f498efd8d22d4f932147f874038878170051 Mon Sep 17 00:00:00 2001
From: jemian <jemian@anl.gov>
Date: Tue, 20 Dec 2016 16:54:29 -0600
Subject: [PATCH 2/3] Update README

---
 README => README.md | 4 ++++
 1 file changed, 4 insertions(+)
 rename README => README.md (64%)

diff --git a/README b/README.md
similarity index 64%
rename from README
rename to README.md
index 180b616..8529c08 100644
--- a/README
+++ b/README.md
@@ -1,3 +1,5 @@
+# README
+
 Test file for a public Git repository.
 
 This is line two.
@@ -5,3 +7,5 @@ This is line two.
 Added another line.
 
 Line 4.
+
+This is now coded in Markdown format
-- 
GitLab


From 3a9a48cb6bcd672f869f90c894298cf383648e2c Mon Sep 17 00:00:00 2001
From: jemian <jemian@anl.gov>
Date: Tue, 20 Dec 2016 17:20:05 -0600
Subject: [PATCH 3/3] Update CHANGES.md

---
 CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index bb1ae00..701c8cb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,4 @@
 # CHANGES
 
-* 2016-12-13: first view
\ No newline at end of file
+* 2016-12-13: first view
+* 2016-12-20: prj checking in here
\ No newline at end of file
-- 
GitLab