Repository: bigtop Updated Branches: refs/heads/branch-0.8 3bbf3e71a -> 8d43b2b70 refs/heads/master 3638b1964 -> ec62e971b
BIGTOP-1442. need to add proper clean up for the toolchain puppet code Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ec62e971 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ec62e971 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ec62e971 Branch: refs/heads/master Commit: ec62e971b835f9f6c839f8b5a8db0e1c3202d863 Parents: 3638b19 Author: Roman Shaposhnik <[email protected]> Authored: Sun Sep 7 20:37:10 2014 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Sun Sep 7 20:37:10 2014 -0700 ---------------------------------------------------------------------- bigtop_toolchain/manifests/scala.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/ec62e971/bigtop_toolchain/manifests/scala.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/scala.pp b/bigtop_toolchain/manifests/scala.pp index 2d54a44..5fc5930 100644 --- a/bigtop_toolchain/manifests/scala.pp +++ b/bigtop_toolchain/manifests/scala.pp @@ -15,8 +15,9 @@ class bigtop_toolchain::scala { $install_scala_cmd = $operatingsystem ? { - 'Ubuntu' => '/bin/bash -c "wget http://www.scala-lang.org/files/archive/scala-2.10.3.deb ; dpkg -x ./scala-2.10.3.deb /"', - default => '/bin/rpm -Uvh http://www.scala-lang.org/files/archive/scala-2.10.3.rpm' + 'Ubuntu' => '/bin/bash -c "wget http://www.scala-lang.org/files/archive/scala-2.10.3.deb ; dpkg -x ./scala-2.10.3.deb /"', + /(?i:(SLES|opensuse))/ => '/usr/bin/zypper install -y http://www.scala-lang.org/files/archive/scala-2.10.3.rpm', + default => '/bin/rpm -U http://www.scala-lang.org/files/archive/scala-2.10.3.rpm' } exec { "install scala":
