From c7c227e6006762b1b5b5b9e5113c3fbaf21f24b2 Mon Sep 17 00:00:00 2001
From: Jeroen Demeyer <jdemeyer@cage.ugent.be>
Date: Mon, 30 Dec 2013 11:31:02 +0100
Subject: [PATCH] Remove testjava.sh from jmol package

---
 build/pkgs/jmol/patches/testjava.sh | 13 -------------
 build/pkgs/jmol/spkg-install        |  6 ------
 2 files changed, 19 deletions(-)
 delete mode 100755 build/pkgs/jmol/patches/testjava.sh

diff --git a/build/pkgs/jmol/patches/testjava.sh b/build/pkgs/jmol/patches/testjava.sh
deleted file mode 100755
index 56c33de9551..00000000000
--- a/build/pkgs/jmol/patches/testjava.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-type -atp java
-OUT=$?
-#echo $OUT
-if [ $OUT -eq 0 ]; then
-#found java now check 1.5<=version<=1.7
-#version >1.7 may be OK just not checked yet.
-  java -version 2>&1|grep version.*[1]\.[567]
-else
-  exit 1
-fi
-#OUT=$?
-#echo $OUT
diff --git a/build/pkgs/jmol/spkg-install b/build/pkgs/jmol/spkg-install
index 83080d26337..4e3e4f45b82 100755
--- a/build/pkgs/jmol/spkg-install
+++ b/build/pkgs/jmol/spkg-install
@@ -26,12 +26,6 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-cp "$SPKGDIR"/patches/testjava.sh "$SPKGDIR"/src/jmol/
-if [ $? -ne 0 ]; then
-   echo "Error adding testjava.sh to jmol directory. Exiting."
-   exit 1
-fi
-
 # Check for sagenb location
 if [ ! -d "$SAGE_ROOT/devel/sagenb/sagenb/data/jmol" ]; then
     echo "No old Jmol install in notebook. Skipping removal of Jmol from notebook."