5 files changed, 24 insertions, 19 deletions
diff --git a/development/jdk/README b/development/jdk/README
index 7cacdc914e..251409ef35 100644
--- a/development/jdk/README
+++ b/development/jdk/README
@@ -6,13 +6,13 @@ This will also package JRE so you will not need a separate JRE build.
 
 The mozilla plugin is no longer activated by default.
 
-*************************************************************************
-* YOU MUST AGREE TO ORACLE'S DOWNLOAD AGREEMENT AND REGISTER AN ACCOUNT *
-* WITH ORACLE BEFORE YOU CAN DOWNLOAD THE JDK BINARY PACKAGE FROM THEM. *
-* THIS MEANS THAT YOU HAVE TO USE SOME SORT OF WEB BROWSER, E.G.        *
-* FIREFOX, TO DOWNLOAD IT.  LINKS, WGET, ET AL WILL NOT WORK.           *
-*************************************************************************
+************************************************************************
+* YOU MUST AGREE TO ORACLE'S DOWNLOAD AGREEMENT AND REGISTER AN        *
+* ACCOUNT WITH ORACLE BEFORE YOU CAN DOWNLOAD THE JDK BINARY PACKAGE   *
+* FROM THEM.  THIS MEANS THAT YOU HAVE TO USE SOME SORT OF WEB         *
+* BROWSER, E.G. FIREFOX, TO DOWNLOAD IT.  LINKS, WGET, ET AL WILL      *
+* NOT WORK.                                                            *
+************************************************************************
 
 You might be able to download the necessary parts from here:
 https://java.com/en/download/linux_manual.jsp
-
diff --git a/development/jdk/jdk.SlackBuild b/development/jdk/jdk.SlackBuild
index 03cacd2a97..67abbb9992 100644
--- a/development/jdk/jdk.SlackBuild
+++ b/development/jdk/jdk.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Modified for SlackBuilds.org by David Somero
 
@@ -23,10 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=jdk
-VERSION=${VERSION:-8u231}
+VERSION=${VERSION:-8u391}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 DVER=1.$(printf $VERSION | cut -du -f1).0_$(printf $VERSION | cut -du -f2)
 
@@ -38,9 +41,13 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-jdk
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "x86_64" ]; then
@@ -156,4 +163,4 @@ cp -a \
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/jdk/jdk.info b/development/jdk/jdk.info
index c6acf8dd8a..82ae81dc42 100644
--- a/development/jdk/jdk.info
+++ b/development/jdk/jdk.info
@@ -1,10 +1,10 @@
 PRGNAM="jdk"
-VERSION="8u231"
+VERSION="8u391"
 HOMEPAGE="https://www.oracle.com/technetwork/java/javase/downloads/index.html"
-DOWNLOAD="https://download.oracle.com/otn/java/jdk/8u231-b11/5b13a193868b4bf28bcb45c792fce896/jdk-8u231-linux-i586.tar.gz"
-MD5SUM="127300ce1ad76c3ef751b029103f399a"
-DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/8u231-b11/5b13a193868b4bf28bcb45c792fce896/jdk-8u231-linux-x64.tar.gz"
-MD5SUM_x86_64="c1fef2e714be761773ee0fc2be5dd78e"
+DOWNLOAD="https://download.oracle.com/otn/java/jdk/8u391-b13/b291ca3e0c8548b5a51d5a5f50063037/jdk-8u391-linux-i586.tar.gz"
+MD5SUM="75566a827dc1d80beebb83b2b60b0729"
+DOWNLOAD_x86_64="https://download.oracle.com/otn/java/jdk/8u391-b13/b291ca3e0c8548b5a51d5a5f50063037/jdk-8u391-linux-x64.tar.gz"
+MD5SUM_x86_64="87db638b497831cd72d98cc4de40dc6b"
 REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/development/jdk/profile.d/jdk.csh b/development/jdk/profile.d/jdk.csh
index 3a1ec7be8b..24580311a3 100644
--- a/development/jdk/profile.d/jdk.csh
+++ b/development/jdk/profile.d/jdk.csh
@@ -1,4 +1,3 @@
 #!/bin/csh
 setenv JAVA_HOME /usr/lib/java
-setenv MANPATH ${MANPATH}:${JAVA_HOME}/man
 setenv PATH ${PATH}:${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin
diff --git a/development/jdk/profile.d/jdk.sh b/development/jdk/profile.d/jdk.sh
index ed0bc73d4d..66815e299f 100644
--- a/development/jdk/profile.d/jdk.sh
+++ b/development/jdk/profile.d/jdk.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 export JAVA_HOME=/usr/lib/java
-export MANPATH="${MANPATH}:${JAVA_HOME}/man"
 export PATH="${PATH}:${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"