add toolsDir param to RunHook

cmd/jujuc/server/context.go

Index: cmd/jujuc/server/context.go
=== modified file 'cmd/jujuc/server/context.go'
--- cmd/jujuc/server/context.go	2012-09-13 15:33:32 +0000
+++ cmd/jujuc/server/context.go	2012-09-13 20:32:50 +0000
@@ -82,11 +82,11 @@
 // hookVars returns an os.Environ-style list of strings necessary to run a hook
 // such that it can know what environment it's operating in, and can call back
 // into ctx.
-func (ctx *HookContext) hookVars(charmDir, socketPath string) []string {
+func (ctx *HookContext) hookVars(charmDir, toolsDir, socketPath string) []string {
 	vars := []string{
 		"APT_LISTCHANGES_FRONTEND=none",
 		"DEBIAN_FRONTEND=noninteractive",
-		"PATH=" + os.Getenv("PATH"),
+		"PATH=" + toolsDir + ":" + os.Getenv("PATH"),
 		"CHARM_DIR=" + charmDir,
 		"JUJU_CONTEXT_ID=" + ctx.Id,
 		"JUJU_AGENT_SOCKET=" + socketPath,
@@ -104,9 +104,9 @@
 
 // RunHook executes a hook in an environment which allows it to to call back
 // into ctx to execute jujuc tools.
-func (ctx *HookContext) RunHook(hookName, charmDir, socketPath string) error {
+func (ctx *HookContext) RunHook(hookName, charmDir, toolsDir, socketPath string) error {
 	ps := exec.Command(filepath.Join(charmDir, "hooks", hookName))
-	ps.Env = ctx.hookVars(charmDir, socketPath)
+	ps.Env = ctx.hookVars(charmDir, toolsDir, socketPath)
 	ps.Dir = charmDir
 	outReader, err := ps.StdoutPipe()
 	if err != nil {