Merge lp:~adeuring/charms/precise/charmworld/fix-install-hook into lp:~juju-jitsu/charms/precise/charmworld/trunk

[Abel Deuring]

fix an error in the install hook: The environment variable UPGRADING is not always defined when the hook is invoked, but the 'u' in "set -eu" at the top of the script lets it fail when a non-exiting variable is used.

=== modified file 'hooks/install'
--- hooks/install	2013-03-06 18:29:54 +0000
+++ hooks/install	2013-03-07 18:37:22 +0000
@@ -34,6 +34,7 @@
 install -o charmworld -g charmworld -m 0755 -d $charmworld_home/var/charms
 $INSTALL scripts/run-write-errors $webops_home
 python scripts/gen_deploymgr.py
+if [ ! -v UPGRADING ]; then UPGRADING=0 ; fi
 if [ "$UPGRADING" != "1" ]; then
     maybe_rmtree $project_dir
 fi