From b325ef81be1efff734365a771ed3211f68fb4abe Mon Sep 17 00:00:00 2001
From: Ryan Cui <rcui@chromium.org>
Date: Wed, 8 Aug 2012 13:11:44 -0700
Subject: [PATCH] Fix hook invocation to not clear the screen.

Don't run .bash_logout after invocation of the hook, which clears the
screen, sending unnecessary escape characters.

BUG=None
TEST=Ran locally.

Change-Id: I6c466040e7169d304b892b85be6a5b0d578e7714
Reviewed-on: https://gerrit.chromium.org/gerrit/29645
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Ryan Cui <rcui@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
---
 sdk_lib/enter_chroot.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index 53728e5b53..3e4d980978 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -614,9 +614,8 @@ if [ $FLAGS_early_make_chroot -eq $FLAGS_FALSE ]; then
   chroot_script_root="\${HOME}/trunk/src/scripts"
   hook_rel_path="chroot_version_hooks.d/44_fix_gerrit_chrome"
   gerrit_chrome_hook="${chroot_script_root}/${hook_rel_path}"
-  entry_hook=(eval "source \"${gerrit_chrome_hook}\"")
   sudo -- chroot "${FLAGS_chroot}" "${cmd[@]}" "${CHROOT_PASSTHRU[@]}" \
-                 "${entry_hook[@]}"
+                 bash -c "source \"${gerrit_chrome_hook}\""
 fi
 
 sudo -- chroot "${FLAGS_chroot}" "${cmd[@]}" "${CHROOT_PASSTHRU[@]}" "$@"