Sophie

Sophie

distrib > Fedora > 15 > i386 > by-pkgid > 6136fa0ea57ff5c374d7e2c5ce161e25 > files > 6

jhdf5-2.7-5.fc15.src.rpm

From c0e1c8443a6ee05f6a10508490fe363d4bc493ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <c.david86@gmail.com>
Date: Mon, 27 Jun 2011 21:58:51 +0200
Subject: [PATCH 6/7] clean hdfview.sh

---
 bin/hdfview.sh.in |   92 ++++++-----------------------------------------------
 1 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/bin/hdfview.sh.in b/bin/hdfview.sh.in
index f590d86..5090b82 100755
--- a/bin/hdfview.sh.in
+++ b/bin/hdfview.sh.in
@@ -1,92 +1,20 @@
 #!/bin/sh
 
-# Set up default variable values if not supplied by the user.
+CLASSPATH="$CLASSPATH:/usr/lib/jhdf/jhdf.jar:/usr/lib64/jhdf/jhdf.jar"
+CLASSPATH="$CLASSPATH:/usr/lib/jhdf/jhdf4obj.jar:/usr/lib64/jhdf/jhdf4obj.jar"
 
-# where the HDFView is installed, e.g. /home/user1/hdfview
-HDFJAVA=@JH45INST@
-export HDFJAVA
+LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jhdf:/usr/lib64/jhdf"
 
-# where Java is installed (requires jdk1.4.x or above), e.g. /usr/jdk1.4.2/bin
-JAVAHOME=@JAVABIN@
-export JAVAHOME
+CLASSPATH="$CLASSPATH:/usr/lib/jhdf5/jhdf5.jar:/usr/lib64/jhdf5/jhdf5.jar"
+CLASSPATH="$CLASSPATH:/usr/lib/jhdf5/jhdf5obj.jar:/usr/lib64/jhdf5/jhdf5obj.jar"
+CLASSPATH="$CLASSPATH:/usr/lib/jhdf5/jhdfobj.jar:/usr/lib64/jhdf5/jhdfobj.jar"
 
-###############################################################################
-#            DO NOT MODIFY BELOW THIS LINE
-###############################################################################
+LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jhdf5:/usr/lib64/jhdf5"
 
-CPATH=$HDFJAVA"/lib/jhdf.jar:"$HDFJAVA"/lib/jhdf5.jar:"$HDFJAVA"/lib/jhdfobj.jar"
-CPATH=$CPATH":"$HDFJAVA"/lib/netcdf.jar:"$HDFJAVA"/lib/fits.jar:"$HDFJAVA"/lib/h5srb.jar"
-CPATH=$CPATH":"$HDFJAVA"/lib/jhdf4obj.jar:"$HDFJAVA"/lib/jhdf5obj.jar:"$HDFJAVA"/lib/jhdfview.jar"
-CPATH=$CPATH":"$HDFJAVA"/lib/jgraph.jar:"$HDFJAVA"/lib/ext/*"
 
-TEST=/usr/bin/test
-if [ ! -x /usr/bin/test ] 
-then
-TEST=`which test`
-fi
-
-if [ ! -d $JAVAHOME ]; then
-    JAVALOC=`which java`
-    LASTSLASH=`perl -e "print rindex(\"${JAVALOC}\", '/')"`
-    JAVAHOME=`perl -e "print substr(\"${JAVALOC}\", 0, $LASTSLASH)"`
-fi
-
-if $TEST -z "$CLASSPATH"; then
-	CLASSPATH=""
-fi
-CLASSPATH=$CPATH":"$CLASSPATH
+CLASSPATH="$CLASSPATH:/usr/share/java/jhdfview.jar"
 export CLASSPATH
-
-if $TEST -n "$JAVAHOME" ; then
-	PATH=$JAVAHOME":"$PATH
-	export PATH
-fi
-
-
-if $TEST -e /bin/uname; then
-   os_name=`/bin/uname -s`
-elif $TEST -e /usr/bin/uname; then
-   os_name=`/usr/bin/uname -s`
-else
-   os_name=unknown
-fi
-
-if $TEST -z "$LD_LIBRARY_PATH" ; then
-        LD_LIBRARY_PATH=""
-fi
-
-case  $os_name in
-    SunOS)
-	LD_LIBRARY_PATH=$HDFJAVA/lib/solaris:$HDFJAVA/lib/ext:$LD_LIBRARY_PATH
-	;;
-    Linux)
-        LD_LIBRARY_PATH=$HDFJAVA"/lib/linux:"$HDFJAVA"/lib/ext:"$LD_LIBRARY_PATH
-	;;
-    IRIX*)
-	OSREV=`/bin/uname -r`
-	LD_LIBRARY_PATH=$HDFJAVA"/lib/irix-6.5:"$HDFJAVA"/lib/ext:"$LD_LIBRARY_PATH 
-	LD_LIBRARYN32_PATH=$HDFJAVA"/lib/irix-6.5:"$HDFJAVA"/lib/ext":$LD_LIBRARY_PATH
-	export LD_LIBRARYN32_PATH
-	;;
-    OSF1)
-	LD_LIBRARY_PATH=$HDFJAVA"/lib/alpha:"$HDFJAVA"/lib/ext:"$LD_LIBRARY_PATH
-	;;
-    AIX)
-	LD_LIBRARY_PATH=$HDFJAVA"/lib/aix:"$HDFJAVA"/lib/ext:"$LD_LIBRARY_PATH
-	;;
-    Darwin)
-	DYLD_LIBRARY_PATH=$HDFJAVA"/lib/macosx:"$HDFJAVA"/lib/ext:"$DYLD_LIBRARY_PATH
-	export DYLD_LIBRARY_PATH
-	LD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
-	;;
-    FreeBSD)
-	LD_LIBRARY_PATH=$HDFJAVA"/lib/freebsd:"$HDFJAVA"/lib/ext:"$LD_LIBRARY_PATH
-	;;
-    *)
-	echo "Unknown Operating System:  HDFView may not work correctly"
-        ;;
-esac
-
 export LD_LIBRARY_PATH
 
-$JAVAHOME/java -Xmx1000m -Djava.library.path=$LD_LIBRARY_PATH ncsa.hdf.view.HDFView -root $HDFJAVA $*
+java -Xmx1000m ncsa.hdf.view.HDFView $*
+
-- 
1.7.7