From e1e2014b00f7ad6315111057b7842810f7f27ee6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 15 Sep 2014 17:39:34 +0200 Subject: [PATCH] oracle-jdk: switch to INSTALL.msg. --- srcpkgs/oracle-jdk/INSTALL | 18 +----------------- srcpkgs/oracle-jdk/INSTALL.msg | 14 ++++++++++++++ srcpkgs/oracle-jdk/template | 2 +- 3 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 srcpkgs/oracle-jdk/INSTALL.msg diff --git a/srcpkgs/oracle-jdk/INSTALL b/srcpkgs/oracle-jdk/INSTALL index 5e9161d0eac..b82735d5791 100644 --- a/srcpkgs/oracle-jdk/INSTALL +++ b/srcpkgs/oracle-jdk/INSTALL @@ -29,22 +29,6 @@ post) RESULT=$? rm -r $BUILD_DIR [ $RESULT -ne 0 ] && exit $RESULT - cat << _EOF -===================================================================== - -- The Oracle JDK package is licensed software. - - You MUST read and agree to the license stored in - /usr/share/licenses/oracle-jdk/LICENSE - before using it. - -- Please re-login to update PATH and JAVA_HOME or re-source - /etc/profile: - - $ source /etc/profile - -===================================================================== -_EOF - ;; + ;; esac diff --git a/srcpkgs/oracle-jdk/INSTALL.msg b/srcpkgs/oracle-jdk/INSTALL.msg new file mode 100644 index 00000000000..513fad93f38 --- /dev/null +++ b/srcpkgs/oracle-jdk/INSTALL.msg @@ -0,0 +1,14 @@ +===================================================================== + +- The Oracle JDK package is licensed software. + + You MUST read and agree to the license stored in + /usr/share/licenses/oracle-jdk/LICENSE + before using it. + +- Please re-login to update PATH and JAVA_HOME or re-source + /etc/profile: + + $ source /etc/profile + +===================================================================== diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template index 92026011893..81993d30d3d 100644 --- a/srcpkgs/oracle-jdk/template +++ b/srcpkgs/oracle-jdk/template @@ -2,7 +2,7 @@ pkgname=oracle-jdk version=8u20 _longVersion=1.8.0_20 -revision=3 +revision=4 _build=26 short_desc="Java Development Kit (JDK)"