Juju Charms Collection
kibana package

Merge lp:~evarlast/charms/trusty/kibana/fix-tarball-install-check into lp:charms/trusty/kibana

  1. Trusty Tahr (14.04)
  2. fix-tarball-install-check
  3. Merge into trunk
Proposed by Jay R. Wren
Status: Merged
Merged at revision: 17
Proposed branch: lp:~evarlast/charms/trusty/kibana/fix-tarball-install-check
Merge into: lp:charms/trusty/kibana
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/install (+1/-1)
To merge this branch: bzr merge lp:~evarlast/charms/trusty/kibana/fix-tarball-install-check
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+255380@code.launchpad.net

Description of the change

Fix a bug introduced in https://code.launchpad.net/~canonical-ci-engineering/charms/trusty/kibana/local-tarball/+merge/254638

[! isn't valid bash, a space is needed, and since its bash, may as well use [[ and ]] to prevent forking /usr/bin/[

To post a comment you must log in.
Revision history for this message
Charles Butler (lazypower) wrote :

+1 LGTM Thanks for the catch!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2015-03-30 16:53:51 +0000
3+++ hooks/install 2015-04-07 15:21:05 +0000
4@@ -11,7 +11,7 @@
5 apt-get update
6 apt-get install -y curl wget git nginx
7
8-if [! -f $KIBANA_TARBALL]; then
9+if [[ ! -f $KIBANA_TARBALL ]]; then
10 juju-log "download kibana from elasticsearch.org"
11 wget -q -O /tmp/kibana.tgz ${KIBANA_SOURCE}
12 echo "${KIBANA_SOURCE_CHECKSUM} /tmp/kibana.tgz" > /tmp/kibana.tgz.sha1

Subscribers

People subscribed via source and target branches