mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-26 18:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move code to initialize TTY into its own function

Browse Source
This commit is contained in:
Kovid Goyal
2022-03-05 15:16:04 +05:30
parent 591f711886
commit 7fe110dff1
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
shell-integration/ssh/bootstrap.sh
View File

@@ -2,11 +2,26 @@
# Copyright (C) 2022 Kovid Goyal <kovid at kovidgoyal.net> # Copyright (C) 2022 Kovid Goyal <kovid at kovidgoyal.net>
# Distributed under terms of the GPLv3 license. # Distributed under terms of the GPLv3 license.
saved_tty_settings=""
cleanup_on_bootstrap_exit() { cleanup_on_bootstrap_exit() {
[ -n "$saved_tty_settings" ] && command stty "$saved_tty_settings" 2> /dev/null < /dev/tty [ -n "$saved_tty_settings" ] && command stty "$saved_tty_settings" 2> /dev/null < /dev/tty
saved_tty_settings="" saved_tty_settings=""
} }
die() { printf "\033[31m%s\033[m\n\r" "$*" > /dev/stderr; cleanup_on_bootstrap_exit; exit 1; }
init_tty() {
saved_tty_settings=$(command stty -g 2> /dev/null < /dev/tty)
tty_ok="n"
[ -n "$saved_tty_settings" ] && tty_ok="y"
if [ "$tty_ok" = "y" ]; then
command stty raw min 1 time 0 -echo 2> /dev/null < /dev/tty || die "stty failed to set raw mode"
return 0
fi
return 1
}
# try to use zsh's builtin sysread function for reading to TTY # try to use zsh's builtin sysread function for reading to TTY
# as it is superior to the POSIX variants. The builtin read function doesn't work # as it is superior to the POSIX variants. The builtin read function doesn't work
# as it hangs reading N bytes on macOS # as it hangs reading N bytes on macOS
@@ -58,17 +73,8 @@ else
} }
fi fi
die() { printf "\033[31m%s\033[m\n\r" "$*" > /dev/stderr; cleanup_on_bootstrap_exit; exit 1; }
debug() { dcs_to_kitty "print" "debug $1"; } debug() { dcs_to_kitty "print" "debug $1"; }
echo_via_kitty() { dcs_to_kitty "echo" "$1"; } echo_via_kitty() { dcs_to_kitty "echo" "$1"; }
saved_tty_settings=$(command stty -g 2> /dev/null < /dev/tty)
tty_ok="n"
[ -n "$saved_tty_settings" ] && tty_ok="y"
if [ "$tty_ok" = "y" ]; then
command stty raw min 1 time 0 -echo 2> /dev/null < /dev/tty || die "stty failed to set raw mode"
trap 'cleanup_on_bootstrap_exit' EXIT
fi
if [ -z "$HOSTNAME" ]; then if [ -z "$HOSTNAME" ]; then
hostname=$(command hostname 2> /dev/null) hostname=$(command hostname 2> /dev/null)
@@ -91,6 +97,7 @@ data_password="DATA_PASSWORD"
password_filename="PASSWORD_FILENAME" password_filename="PASSWORD_FILENAME"
leading_data="" leading_data=""
init_tty && trap 'cleanup_on_bootstrap_exit' EXIT
[ "$tty_ok" = "y" ] && dcs_to_kitty "ssh" "hostname="$hostname":pwfile="$password_filename":user="$USER":pw="$data_password"" [ "$tty_ok" = "y" ] && dcs_to_kitty "ssh" "hostname="$hostname":pwfile="$password_filename":user="$USER":pw="$data_password""
record_separator=$(printf "\036") record_separator=$(printf "\036")