Merge pull request #1 from sn-amber/master

New Installation Procedure

INSTALL.txt

@@ -1,12 +1,7 @@
-to install *liggghts post processing* (lpp) execute the following 
+to install *liggghts post processing* (lpp) and pizza.py execute
+
 ./install.sh
 
+or if you want to specify an install directory other then ~/bin
 
-
-
-to install *pizza.py* copy the following lines of code 
-into your bashrc (please change the variable CFDEM_lppPath according 
-to your system):
-
-CFDEM_pizzaPath=/Users/s/work/parallelpizza/nightly_build
-alias pizza  ="python -i $CFDEM_pizzaPath/src/pizza.py"
+./install.sh -p path/to/install/directory

install.sh

@@ -1,22 +1,78 @@
 #!/bin/bash
 
-if test "`id -u`" -ne 0
-	then 
-	echo "ERROR: You need to run this script as root" 
-	exit 
-fi
+PREFIX=$HOME/bin
 
-echo "checking for old installations..."
-if [[ -L /usr/bin/lpp ]]; then
-	echo "ERROR: you need to uninstall old lpp versions first."
-	echo "you can do by so executing"
-	echo "sudo rm /usr/bin/lpp /usr/bin/pizza"
+USAGE="usage\n\t./install.sh [-p path] [-h]\n\
+\t-p\tset install directory\n\
+\t-h\thelp"
+
+# get prefix if passed
+while getopts "p:h" OPTION; do
+	case $OPTION in
+		p )
+			PREFIX=$OPTARG
+			;;
+		h )
+			echo -e $USAGE
+			exit 4
+			;;
+		? )
+			echo -e $USAGE
+			exit 4
+			;;
+	esac
+done
+
+
+# check prefix
+if [[ ! -d $PREFIX ]]; then
+	echo "directory '$PREFIX' not found"
+	echo "create directory or choose different install directory using the -p flag"
 	exit 1
 fi
 
-echo "setting symbolic links..."
-ln -s $(pwd)/src/lpp.py /usr/bin/lpp
 
-echo "checking installation..."
-echo "which lpp"
-echo $(which lpp)
+# check old installations
+echo "checking for old installations..."
+if hash lpp 2>/dev/null ; then
+	echo "WARNING: lpp is already installed on your system."
+	echo "         please remove $(which lpp) before reinstalling."
+fi
+if hash pizza 2>/dev/null ; then
+	echo "WARNING: pizza is already installed on your system."
+	echo "         please remove $(which pizza) before reinstalling."
+fi
+if hash lpp 2>/dev/null ; then
+	exit 2;
+fi
+if hash pizza 2>/dev/null ; then
+	exit 2;
+fi
+
+
+# create symlinks
+echo "creating symlinks..."
+ln -s $(pwd)/src/lpp.py $PREFIX/lpp
+if [ $? -ne 0 ]; then
+	echo "cannot create symbolic link for lpp"
+	echo "use a different install directory or try calling this script as root"
+	exit 3
+fi
+
+ln -s $(pwd)/src/pizza.py $PREFIX/pizza
+if [ $? -ne 0 ]; then
+	echo "cannot create symbolic link for pizza"
+	echo "use a different install directory or try calling this script as root"
+	exit 3
+fi
+
+
+# update path if lpp cannot be found
+if ! hash lpp 2>/dev/null; then
+	echo "updating path..."
+	echo -e "\n" >> $HOME/.bashrc
+	echo 'export PATH='$PREFIX':$PATH' >> $HOME/.bashrc
+	echo -e "\n" >> $HOME/.bashrc
+	export PATH=$PREFIX:$PATH
+	echo "please execute the command 'bash' to finalize the installation"
+fi

src/lpp.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 oneline = "writing pp-data in vtk format automatically, saving memory"
 
 docstr = """this is the docstr of LIGGGHTSPostProcessing"""

src/pizza.py

@@ -1,4 +1,4 @@
-#!/usr/local/bin/python -i
+#!/usr/bin/python -i
 
 # Pizza.py toolkit, www.cs.sandia.gov/~sjplimp/pizza.html
 # Steve Plimpton, sjplimp@sandia.gov, Sandia National Laboratories