PShell startup script to support jars ahead in the class path

This commit is contained in:
Gobbo Alexandre
2020-05-13 17:42:49 +02:00
parent 8ff0ee16ee
commit c18f0fffcd

24
pshell
View File

@@ -5,6 +5,7 @@
#Parse JVM arguments, Pshell version and JEP option
export PSHELL_VER=default
export JVM_ARGS=
export JVM_UCP=
#export JAVA_VER=/opt/gfa/java/openjdk-1.8.0_40
#export JAVA_VER=/opt/gfa/java/jdk1.8.0_72
export JAVA_VER=/opt/gfa/java/openjdk-12_32
@@ -19,6 +20,12 @@ case $i in
shift
;;
-ucp=*)
UCP="${i#*=}"
#echo 'UCP:' ${UCP}
shift
;;
-version=*|--version=*)
export PSHELL_VER="${i#*=}"
echo "Using version " ${PSHELL_VER}
@@ -85,11 +92,15 @@ fi
#Standard startup
if [[ $@ != **-py** ]] ; then
#if [[ $JEP == "" ]] ; then
if [[ $UCP == "" ]] ; then
#echo 'Standard launch'
${JAVA_VER}/bin/java ${JVM_EARGS} ${JVM_ARGS} -jar /opt/gfa/pshell/${PSHELL_VER} $@
exit
fi
fi
if [[ $@ == **-py** ]] ; then
#Using JEP
#First clean path and vars
#unset JCPDS_PATH
@@ -122,8 +133,9 @@ if [[ $@ == **-py3** ]] ; then
#export LD_LIBRARY_PATH=/opt/gfa/python-3.5/latest/lib:/opt/gfa/pshell/python/jep/py3
#${PYTHONHOME}/lib is for OpenJDK
export LD_LIBRARY_PATH=${PYTHONHOME}/lib:/opt/gfa/pshell/python/jep/py3
export LD_PRELOAD=${PYTHONHOME}/lib/libpython3.5m.so
#export LD_LIBRARY_PATH=${PYTHONHOME}/lib:/opt/gfa/pshell/python/jep/py3
export LD_LIBRARY_PATH=/opt/gfa/pshell/python/jep/py3
export LD_PRELOAD=${PYTHONHOME}/lib/libpython3.5m.so
else
#Python 2
echo "Setting Python 2 for JEP"
@@ -131,7 +143,13 @@ else
export LD_LIBRARY_PATH=${PYTHONHOME}/lib/python2.7/site-packages/jep
export JEP_JAR=${PYTHONHOME}/lib/python2.7/site-packages/jep/jep-3.5.3.jar
fi
fi
if [[ $UCP != "" ]] ; then
UCP=${UCP}:
fi
export PATH=${PYTHONHOME}/bin:$CLEAN_PATH
${JAVA_VER}/bin/java ${JVM_EARGS} ${JVM_ARGS} -cp /opt/gfa/pshell/${PSHELL_VER}:${JEP_JAR} ch.psi.pshell.ui.App $@
${JAVA_VER}/bin/java ${JVM_EARGS} ${JVM_ARGS} -cp ${UCP}/opt/gfa/pshell/${PSHELL_VER}:${JEP_JAR} ch.psi.pshell.ui.App $@