Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Select the latest available java package to install dynamically

This commit is contained in:
Svetoslav Neykov 2016-12-23 13:21:48 +02:00 committed by Ignasi Barrera
parent 1c524cadbb
commit 325a6890c3
5 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compute/src/test/resources/initscript_with_java.sh
View File

@ -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

11
compute/src/test/resources/initscript_with_jetty.sh
View File

@ -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

11
compute/src/test/resources/runscript.sh
View File

@ -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

11
scriptbuilder/src/main/resources/functions/installOpenJDK.sh
View File

@ -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

11
scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
View File

@ -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