diff options
| author | Matthew Thode <prometheanfire@gentoo.org> | 2017-07-11 02:57:50 -0500 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2017-07-11 03:01:58 -0500 |
| commit | 3bb2841ff9eb43c54d05747efa6de82248428693 (patch) | |
| tree | 6dd52150bf59a18fe2a9b1374fa6cec1c7dbde7f /app-admin/puppetserver | |
| parent | e57a5c17a88e5ed93f126895610725d610c4948b (diff) | |
| download | gentoo-3bb2841ff9eb43c54d05747efa6de82248428693.tar.gz gentoo-3bb2841ff9eb43c54d05747efa6de82248428693.tar.xz | |
app-admin/puppetserver: fix version of java needed, and fix gem install escapes
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'app-admin/puppetserver')
| -rw-r--r-- | app-admin/puppetserver/puppetserver-5.0.0.ebuild | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app-admin/puppetserver/puppetserver-5.0.0.ebuild b/app-admin/puppetserver/puppetserver-5.0.0.ebuild index 1fa204224cf..f33b767e9cc 100644 --- a/app-admin/puppetserver/puppetserver-5.0.0.ebuild +++ b/app-admin/puppetserver/puppetserver-5.0.0.ebuild @@ -16,7 +16,7 @@ IUSE="puppetdb" KEYWORDS="~amd64 ~x86" RDEPEND+=" - >=virtual/jdk-1.7.0 + >=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]" DEPEND+="" @@ -120,8 +120,10 @@ pkg_postinst() { elog "puppet config set --section master codedir /etc/puppetlabs/code" elog elog "# install puppetserver gems" + elog "cd /opt/puppetlabs/server/apps/puppetserver" + elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf" elog "while read LINE" elog "do" - elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install $(echo $LINE |awk '{print $1}') --version $(echo $LINE |awk '{print $2}')" + elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')" elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt" } |