You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by kv...@apache.org on 2012/03/20 11:21:03 UTC
svn commit: r1302824 - in /whirr/trunk: CHANGES.txt
core/src/main/resources/functions/install_openjdk.sh
core/src/main/resources/functions/install_oracle_jdk6.sh
core/src/main/resources/functions/install_oracle_jdk7.sh
Author: kve
Date: Tue Mar 20 10:21:03 2012
New Revision: 1302824
URL: http://svn.apache.org/viewvc?rev=1302824&view=rev
Log:
WHIRR-555: Fix Java install scripts
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/core/src/main/resources/functions/install_openjdk.sh
whirr/trunk/core/src/main/resources/functions/install_oracle_jdk6.sh
whirr/trunk/core/src/main/resources/functions/install_oracle_jdk7.sh
Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1302824&r1=1302823&r2=1302824&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Tue Mar 20 10:21:03 2012
@@ -73,6 +73,8 @@ Trunk (unreleased changes)
BUG FIXES
+ WHIRR-555. Fix java install script: use `...` instead of $(...)
+
WHIRR-473. HadoopServiceController.getInstance(String config) does
not update instances correctly (Frank Scholten via asavu)
Modified: whirr/trunk/core/src/main/resources/functions/install_openjdk.sh
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/resources/functions/install_openjdk.sh?rev=1302824&r1=1302823&r2=1302824&view=diff
==============================================================================
--- whirr/trunk/core/src/main/resources/functions/install_openjdk.sh (original)
+++ whirr/trunk/core/src/main/resources/functions/install_openjdk.sh Tue Mar 20 10:21:03 2012
@@ -18,21 +18,50 @@ function install_openjdk_deb() {
apt-get update
apt-get -y install openjdk-6-jdk
+ # Try to set JAVA_HOME in a number of commonly used locations
export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
- echo "export JAVA_HOME=$JAVA_HOME" >> /etc/profile
- echo "export JAVA_HOME=$JAVA_HOME" >> ~root/.bashrc
+ if [ -f /etc/profile ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> /etc/profile
+ fi
+ if [ -f /etc/bashrc ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> /etc/bashrc
+ fi
+ if [ -f ~root/.bashrc ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> ~root/.bashrc
+ fi
+ if [ -f /etc/skel/.bashrc ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> /etc/skel/.bashrc
+ fi
+ if [ -f "$DEFAULT_HOME/$NEW_USER" ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> $DEFAULT_HOME/$NEW_USER
+ fi
+
update-alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 17000
update-alternatives --set java $JAVA_HOME/bin/java
java -version
-
}
function install_openjdk_rpm() {
yum install java-1.6.0-openjdk
- export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
- echo "export JAVA_HOME=$JAVA_HOME" >> /etc/profile
- echo "export JAVA_HOME=$JAVA_HOME" >> ~root/.bashrc
+ # Try to set JAVA_HOME in a number of commonly used locations
+ export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ if [ -f /etc/profile ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> /etc/profile
+ fi
+ if [ -f /etc/bashrc ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> /etc/bashrc
+ fi
+ if [ -f ~root/.bashrc ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> ~root/.bashrc
+ fi
+ if [ -f /etc/skel/.bashrc ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> /etc/skel/.bashrc
+ fi
+ if [ -f "$DEFAULT_HOME/$NEW_USER" ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> $DEFAULT_HOME/$NEW_USER
+ fi
+
alternatives --install /usr/bin/java java $JAVA_HOME/bin/java 17000
alternatives --set java $JAVA_HOME/bin/java
java -version
Modified: whirr/trunk/core/src/main/resources/functions/install_oracle_jdk6.sh
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/resources/functions/install_oracle_jdk6.sh?rev=1302824&r1=1302823&r2=1302824&view=diff
==============================================================================
--- whirr/trunk/core/src/main/resources/functions/install_oracle_jdk6.sh (original)
+++ whirr/trunk/core/src/main/resources/functions/install_oracle_jdk6.sh Tue Mar 20 10:21:03 2012
@@ -26,7 +26,7 @@ function install_oracle_jdk6() {
re$turn
fi
- arch=$(uname -m)
+ arch=`uname -m`
# Find out which .bin file to download
url=http://download.oracle.com/otn-pub/java/jdk/6u31-b04/jdk-6u31-linux-i586.bin
@@ -34,11 +34,11 @@ function install_oracle_jdk6() {
url=http://download.oracle.com/otn-pub/java/jdk/6u31-b04/jdk-6u31-linux-x64.bin
fi
- tmpdir=$(mktemp -d)
- curl $url -L --silent --show-error --fail --connect-timeout 10 --max-time 600 --retry 5 -o $tmpdir/$(basename $url)
+ tmpdir=`mktemp -d`
+ curl $url -L --silent --show-error --fail --connect-timeout 60 --max-time 600 --retry 5 -o $tmpdir/`basename $url`
- (cd $tmpdir; sh $(basename $url) -noregister)
- mkdir -p $(dirname $target_dir)
+ (cd $tmpdir; sh `basename $url` -noregister)
+ mkdir -p `dirname $target_dir`
(cd $tmpdir; mv jdk1* $target_dir)
rm -rf $tmpdir
@@ -61,6 +61,9 @@ function install_oracle_jdk6() {
if [ -f /etc/bashrc ]; then
echo export JAVA_HOME=$JAVA_HOME >> /etc/bashrc
fi
+ if [ -f ~root/.bashrc ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> ~root/.bashrc
+ fi
if [ -f /etc/skel/.bashrc ]; then
echo export JAVA_HOME=$JAVA_HOME >> /etc/skel/.bashrc
fi
Modified: whirr/trunk/core/src/main/resources/functions/install_oracle_jdk7.sh
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/resources/functions/install_oracle_jdk7.sh?rev=1302824&r1=1302823&r2=1302824&view=diff
==============================================================================
--- whirr/trunk/core/src/main/resources/functions/install_oracle_jdk7.sh (original)
+++ whirr/trunk/core/src/main/resources/functions/install_oracle_jdk7.sh Tue Mar 20 10:21:03 2012
@@ -26,7 +26,7 @@ function install_oracle_jdk7() {
re$turn
fi
- arch=$(uname -m)
+ arch=`uname -m`
# Find out which tarball to download
url=http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-i586.tar.gz
@@ -34,11 +34,11 @@ function install_oracle_jdk7() {
url=http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-x64.tar.gz
fi
- tmpdir=$(mktemp -d)
- curl $url -L --silent --show-error --fail --connect-timeout 10 --max-time 600 --retry 5 -o $tmpdir/$(basename $url)
+ tmpdir=`mktemp -d`
+ curl $url -L --silent --show-error --fail --connect-timeout 60 --max-time 600 --retry 5 -o $tmpdir/`basename $url`
- (cd $tmpdir; tar xzf $(basename $url))
- mkdir -p $(dirname $target_dir)
+ (cd $tmpdir; tar xzf `basename $url`)
+ mkdir -p `dirname $target_dir`
(cd $tmpdir; mv jdk1* $target_dir)
rm -rf $tmpdir
@@ -61,6 +61,9 @@ function install_oracle_jdk7() {
if [ -f /etc/bashrc ]; then
echo export JAVA_HOME=$JAVA_HOME >> /etc/bashrc
fi
+ if [ -f ~root/.bashrc ]; then
+ echo export JAVA_HOME=$JAVA_HOME >> ~root/.bashrc
+ fi
if [ -f /etc/skel/.bashrc ]; then
echo export JAVA_HOME=$JAVA_HOME >> /etc/skel/.bashrc
fi