Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

test/hooks.bats

@@ -59,7 +59,13 @@ OUT
   mkdir -p "$HOME"
   touch "${HOME}/hola.bash"
   ln -s "../../home/hola.bash" "${path}/exec/hello.bash"
+  touch "${path}/exec/bright.sh"
+  ln -s "bright.sh" "${path}/exec/world.bash"
 
   PYENV_HOOK_PATH="$path" run pyenv-hooks exec
-  assert_success "${HOME}/hola.bash"
+  assert_success
+  assert_output <<OUT
+${HOME}/hola.bash
+${PYENV_TEST_DIR}/pyenv.d/exec/bright.sh
+OUT
 }