Merge lp:~dave-cheney/charms/precise/wordpress/trunk into lp:charms/wordpress

[Dave Cheney]

Fixes lp # 1064846

[Marco Ceppi (marcoceppi)]

This looks great, though you've removed the save_pwd bits, which is fine, but the hook needs to cd back to $CHARM_DIR or other hooks will fail when they call hooks/install inline. If you could add the cd back to $CHARM_DIR at the bottom of the hooks/install then I can merge this.

review: Needs Fixing

[Dave Cheney (dave-cheney)]

Ok, I'll fix that with pushd / popd.

On 06/09/2013, at 21:59, Marco Ceppi <email address hidden> wrote:

> Review: Needs Fixing
>
> This looks great, though you've removed the save_pwd bits, which is fine, but the hook needs to cd back to $CHARM_DIR or other hooks will fail when they call hooks/install inline. If you could add the cd back to $CHARM_DIR at the bottom of the hooks/install then I can merge this.
> --
> https://code.launchpad.net/~dave-cheney/charms/precise/wordpress/trunk/+merge/184243
> You are the owner of lp:~dave-cheney/charms/precise/wordpress/trunk.

[lp:~dave-cheney/charms/precise/wordpress/trunk]

69. By Dave Cheney on 2013-09-09

responding to review feedback

[Dave Cheney (dave-cheney)]

ping

[Dave Cheney (dave-cheney)]

ping

[Marco Ceppi (marcoceppi)]

LGTM, Thanks!

review: Approve

=== modified file 'hooks/install'
--- hooks/install	2012-12-13 17:13:17 +0000
+++ hooks/install	2013-09-09 05:54:25 +0000
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -xe
+
 add-apt-repository ppa:charmers/charm-helpers
 apt-get update && apt-get -y upgrade
 
@@ -35,13 +37,15 @@
 fi
 
 juju-log "Installing wp-cli to make this charm's life a little easier ..."
-save_pwd=`pwd`
 git clone https://github.com/wp-cli/wp-cli.git /usr/src/wp-cli
-cd /usr/src/wp-cli
-# 20120926: v0.6.0 is confirmed working, so use it rather than alpha.
-git reset --hard v0.6.0
-git submodule update --init
-utils/dev-build
-cd $save_pwd
+# other hooks call hooks/install and don't expect the CWD to change so
+# run this section in a subshell
+( 
+	cd /usr/src/wp-cli
+	# 20120926: v0.6.0 is confirmed working, so use it rather than alpha.
+	git reset --hard v0.6.0
+	git submodule update --init
+	utils/dev-build
+)
 
 juju-log "So, environment is setup. We'll wait for some hooks to fire off before we get all crazy"