You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2017/01/25 09:47:19 UTC
jclouds git commit: Select the latest available java package to
install dynamically
Repository: jclouds
Updated Branches:
refs/heads/master 1c524cadb -> 325a6890c
Select the latest available java package to install dynamically
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/325a6890
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/325a6890
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/325a6890
Branch: refs/heads/master
Commit: 325a6890c3f88f14a3ea9c8e5d5b5076500c7969
Parents: 1c524ca
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Dec 23 13:21:48 2016 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Jan 25 10:47:06 2017 +0100
----------------------------------------------------------------------
compute/src/test/resources/initscript_with_java.sh | 11 ++++++++---
compute/src/test/resources/initscript_with_jetty.sh | 11 ++++++++---
compute/src/test/resources/runscript.sh | 11 ++++++++---
.../src/main/resources/functions/installOpenJDK.sh | 11 ++++++++---
.../src/test/resources/test_install_jdk_scriptbuilder.sh | 11 ++++++++---
5 files changed, 40 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/325a6890/compute/src/test/resources/initscript_with_java.sh
----------------------------------------------------------------------
diff --git a/compute/src/test/resources/initscript_with_java.sh b/compute/src/test/resources/initscript_with_java.sh
index ce9895b..3232699 100644
--- a/compute/src/test/resources/initscript_with_java.sh
+++ b/compute/src/test/resources/initscript_with_java.sh
@@ -159,7 +159,7 @@ END_OF_JCLOUDS_FILE
function findOpenJDK() {
local oldJavaHome=$JAVA_HOME
unset JAVA_HOME
- for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-1.6.0-openjdk-* /usr/lib/jvm/java-6-openjdk-* /usr/lib/jvm/java-6-openjdk 2>&-`; do
+ for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-*-openjdk* 2>&-`; do
if [ -n "$CANDIDATE" -a -x "$CANDIDATE/bin/java" ]; then
export JAVA_HOME=$CANDIDATE
break
@@ -177,9 +177,14 @@ function installOpenJDK() {
echo reusing JAVA_HOME $JAVA_HOME
else
if which dpkg &> /dev/null; then
- apt-get-update && apt-get-install openjdk-6-jdk
+ apt-get-update && \
+ PACKAGE=$(apt-cache search --names-only '^openjdk-.-jdk$' | sort -r | cut -d' ' -f1 | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ { apt-get-install $PACKAGE-headless || apt-get-install $PACKAGE; }
elif which rpm &> /dev/null; then
- yum-install java-1.6.0-openjdk-devel
+ PACKAGE=$(repoquery --qf='%{name}' --pkgnarrow=available 'java-*-openjdk-devel' | sort -r | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ yum-install $PACKAGE
else
abort "we only support apt-get and yum right now... please contribute"
fi
http://git-wip-us.apache.org/repos/asf/jclouds/blob/325a6890/compute/src/test/resources/initscript_with_jetty.sh
----------------------------------------------------------------------
diff --git a/compute/src/test/resources/initscript_with_jetty.sh b/compute/src/test/resources/initscript_with_jetty.sh
index 7c56241..595dc57 100644
--- a/compute/src/test/resources/initscript_with_jetty.sh
+++ b/compute/src/test/resources/initscript_with_jetty.sh
@@ -159,7 +159,7 @@ END_OF_JCLOUDS_FILE
function findOpenJDK() {
local oldJavaHome=$JAVA_HOME
unset JAVA_HOME
- for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-1.6.0-openjdk-* /usr/lib/jvm/java-6-openjdk-* /usr/lib/jvm/java-6-openjdk 2>&-`; do
+ for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-*-openjdk* 2>&-`; do
if [ -n "$CANDIDATE" -a -x "$CANDIDATE/bin/java" ]; then
export JAVA_HOME=$CANDIDATE
break
@@ -177,9 +177,14 @@ function installOpenJDK() {
echo reusing JAVA_HOME $JAVA_HOME
else
if which dpkg &> /dev/null; then
- apt-get-update && apt-get-install openjdk-6-jdk
+ apt-get-update && \
+ PACKAGE=$(apt-cache search --names-only '^openjdk-.-jdk$' | sort -r | cut -d' ' -f1 | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ { apt-get-install $PACKAGE-headless || apt-get-install $PACKAGE; }
elif which rpm &> /dev/null; then
- yum-install java-1.6.0-openjdk-devel
+ PACKAGE=$(repoquery --qf='%{name}' --pkgnarrow=available 'java-*-openjdk-devel' | sort -r | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ yum-install $PACKAGE
else
abort "we only support apt-get and yum right now... please contribute"
fi
http://git-wip-us.apache.org/repos/asf/jclouds/blob/325a6890/compute/src/test/resources/runscript.sh
----------------------------------------------------------------------
diff --git a/compute/src/test/resources/runscript.sh b/compute/src/test/resources/runscript.sh
index 214c8c6..533b197 100644
--- a/compute/src/test/resources/runscript.sh
+++ b/compute/src/test/resources/runscript.sh
@@ -159,7 +159,7 @@ END_OF_JCLOUDS_FILE
function findOpenJDK() {
local oldJavaHome=$JAVA_HOME
unset JAVA_HOME
- for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-1.6.0-openjdk-* /usr/lib/jvm/java-6-openjdk-* /usr/lib/jvm/java-6-openjdk 2>&-`; do
+ for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-*-openjdk* 2>&-`; do
if [ -n "$CANDIDATE" -a -x "$CANDIDATE/bin/java" ]; then
export JAVA_HOME=$CANDIDATE
break
@@ -177,9 +177,14 @@ function installOpenJDK() {
echo reusing JAVA_HOME $JAVA_HOME
else
if which dpkg &> /dev/null; then
- apt-get-update && apt-get-install openjdk-6-jdk
+ apt-get-update && \
+ PACKAGE=$(apt-cache search --names-only '^openjdk-.-jdk$' | sort -r | cut -d' ' -f1 | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ { apt-get-install $PACKAGE-headless || apt-get-install $PACKAGE; }
elif which rpm &> /dev/null; then
- yum-install java-1.6.0-openjdk-devel
+ PACKAGE=$(repoquery --qf='%{name}' --pkgnarrow=available 'java-*-openjdk-devel' | sort -r | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ yum-install $PACKAGE
else
abort "we only support apt-get and yum right now... please contribute"
fi
http://git-wip-us.apache.org/repos/asf/jclouds/blob/325a6890/scriptbuilder/src/main/resources/functions/installOpenJDK.sh
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/main/resources/functions/installOpenJDK.sh b/scriptbuilder/src/main/resources/functions/installOpenJDK.sh
index bcfe0e9..57fc5b0 100644
--- a/scriptbuilder/src/main/resources/functions/installOpenJDK.sh
+++ b/scriptbuilder/src/main/resources/functions/installOpenJDK.sh
@@ -31,7 +31,7 @@ END_OF_JCLOUDS_FILE
function findOpenJDK() {
local oldJavaHome=$JAVA_HOME
unset JAVA_HOME
- for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-1.6.0-openjdk-* /usr/lib/jvm/java-6-openjdk-* /usr/lib/jvm/java-6-openjdk 2>&-`; do
+ for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-*-openjdk* 2>&-`; do
if [ -n "$CANDIDATE" -a -x "$CANDIDATE/bin/java" ]; then
export JAVA_HOME=$CANDIDATE
break
@@ -49,9 +49,14 @@ function installOpenJDK() {
echo reusing JAVA_HOME $JAVA_HOME
else
if which dpkg &> /dev/null; then
- apt-get-update && apt-get-install openjdk-6-jdk
+ apt-get-update && \
+ PACKAGE=$(apt-cache search --names-only '^openjdk-.-jdk$' | sort -r | cut -d' ' -f1 | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ { apt-get-install $PACKAGE-headless || apt-get-install $PACKAGE; }
elif which rpm &> /dev/null; then
- yum-install java-1.6.0-openjdk-devel
+ PACKAGE=$(repoquery --qf='%{name}' --pkgnarrow=available 'java-*-openjdk-devel' | sort -r | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ yum-install $PACKAGE
else
abort "we only support apt-get and yum right now... please contribute"
fi
http://git-wip-us.apache.org/repos/asf/jclouds/blob/325a6890/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
index 2387dfa..43c0b97 100644
--- a/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
+++ b/scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
@@ -159,7 +159,7 @@ END_OF_JCLOUDS_FILE
function findOpenJDK() {
local oldJavaHome=$JAVA_HOME
unset JAVA_HOME
- for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-1.6.0-openjdk-* /usr/lib/jvm/java-6-openjdk-* /usr/lib/jvm/java-6-openjdk 2>&-`; do
+ for CANDIDATE in $oldJavaHome `ls -d /usr/lib/jvm/java-*-openjdk* 2>&-`; do
if [ -n "$CANDIDATE" -a -x "$CANDIDATE/bin/java" ]; then
export JAVA_HOME=$CANDIDATE
break
@@ -177,9 +177,14 @@ function installOpenJDK() {
echo reusing JAVA_HOME $JAVA_HOME
else
if which dpkg &> /dev/null; then
- apt-get-update && apt-get-install openjdk-6-jdk
+ apt-get-update && \
+ PACKAGE=$(apt-cache search --names-only '^openjdk-.-jdk$' | sort -r | cut -d' ' -f1 | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ { apt-get-install $PACKAGE-headless || apt-get-install $PACKAGE; }
elif which rpm &> /dev/null; then
- yum-install java-1.6.0-openjdk-devel
+ PACKAGE=$(repoquery --qf='%{name}' --pkgnarrow=available 'java-*-openjdk-devel' | sort -r | head -1) && \
+ [ ! -z "$PACKAGE" ] && \
+ yum-install $PACKAGE
else
abort "we only support apt-get and yum right now... please contribute"
fi