You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2013/01/23 14:53:54 UTC
[1/2] git commit: WHIRR-691. Java install to support Debian.
Contributed by Graham Gear.
WHIRR-691. Java install to support Debian. Contributed by Graham Gear.
Project: http://git-wip-us.apache.org/repos/asf/whirr/repo
Commit: http://git-wip-us.apache.org/repos/asf/whirr/commit/846a291d
Tree: http://git-wip-us.apache.org/repos/asf/whirr/tree/846a291d
Diff: http://git-wip-us.apache.org/repos/asf/whirr/diff/846a291d
Branch: refs/heads/trunk
Commit: 846a291d9a23026075cfa74608d2534d72271067
Parents: adf8871
Author: Tom White <to...@apache.org>
Authored: Wed Jan 23 13:51:12 2013 +0000
Committer: Tom White <to...@apache.org>
Committed: Wed Jan 23 13:51:12 2013 +0000
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../main/resources/functions/install_oab_java.sh | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/whirr/blob/846a291d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index aa63b06..1920695 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,8 @@ Release 0.8.2 (unreleased changes)
WHIRR-680. Add python scripts to aid ssh/scp in to VMs.
(Steve Loughran via tomwhite)
+
+ WHIRR-691. Java install to support Debian. (Graham Gear via tomwhite)
Release 0.8.1 - 2012-10-19
http://git-wip-us.apache.org/repos/asf/whirr/blob/846a291d/core/src/main/resources/functions/install_oab_java.sh
----------------------------------------------------------------------
diff --git a/core/src/main/resources/functions/install_oab_java.sh b/core/src/main/resources/functions/install_oab_java.sh
index 0dcb3a5..566af55 100644
--- a/core/src/main/resources/functions/install_oab_java.sh
+++ b/core/src/main/resources/functions/install_oab_java.sh
@@ -19,10 +19,10 @@ function install_oab_java_deb() {
# TODO: check that it is not already enabled
sed -i -e 's/universe$/universe multiverse/' /etc/apt/sources.list
- DISTRO=`lsb_release -s -c`
-
apt-get update
-
+ apt-get -y install lsb-release pciutils
+ DISTRO=`lsb_release -s -c`
+
wget https://raw.github.com/flexiondotorg/oab-java6/master/oab-java.sh -O oab-java.sh
chmod +x oab-java.sh
./oab-java.sh