mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-21 13:41:20 +02:00
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>
This commit is contained in:
parent
76272be9de
commit
b325ef81be
@ -614,9 +614,8 @@ if [ $FLAGS_early_make_chroot -eq $FLAGS_FALSE ]; then
|
|||||||
chroot_script_root="\${HOME}/trunk/src/scripts"
|
chroot_script_root="\${HOME}/trunk/src/scripts"
|
||||||
hook_rel_path="chroot_version_hooks.d/44_fix_gerrit_chrome"
|
hook_rel_path="chroot_version_hooks.d/44_fix_gerrit_chrome"
|
||||||
gerrit_chrome_hook="${chroot_script_root}/${hook_rel_path}"
|
gerrit_chrome_hook="${chroot_script_root}/${hook_rel_path}"
|
||||||
entry_hook=(eval "source \"${gerrit_chrome_hook}\"")
|
|
||||||
sudo -- chroot "${FLAGS_chroot}" "${cmd[@]}" "${CHROOT_PASSTHRU[@]}" \
|
sudo -- chroot "${FLAGS_chroot}" "${cmd[@]}" "${CHROOT_PASSTHRU[@]}" \
|
||||||
"${entry_hook[@]}"
|
bash -c "source \"${gerrit_chrome_hook}\""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo -- chroot "${FLAGS_chroot}" "${cmd[@]}" "${CHROOT_PASSTHRU[@]}" "$@"
|
sudo -- chroot "${FLAGS_chroot}" "${cmd[@]}" "${CHROOT_PASSTHRU[@]}" "$@"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user