KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure tdir is deleted on exit

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-09 13:24:24 +05:30
parent 5dde31f80c
commit 08bb63fa92
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,12 @@
# Distributed under terms of the GPLv3 license. # Distributed under terms of the GPLv3 license.
saved_tty_settings="" saved_tty_settings=""
tdir=""
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
[ -n "$tdir" ] && command rm -rf "$tdir"
saved_tty_settings="" saved_tty_settings=""
tdir=""
} }
die() { printf "\033[31m%s\033[m\n\r" "$*" > /dev/stderr; cleanup_on_bootstrap_exit; exit 1; } die() { printf "\033[31m%s\033[m\n\r" "$*" > /dev/stderr; cleanup_on_bootstrap_exit; exit 1; }
@ -195,8 +198,7 @@ compile_terminfo() {
# compile terminfo for this system # compile terminfo for this system
if [ -x "$(command -v tic)" ]; then if [ -x "$(command -v tic)" ]; then
tic_out=$(command tic -x -o "$1/$tname" "$1/.terminfo/kitty.terminfo" 2>&1) tic_out=$(command tic -x -o "$1/$tname" "$1/.terminfo/kitty.terminfo" 2>&1)
rc=$? [ $? = 0 ] || die "Failed to compile terminfo with err: $tic_out";
if [ "$rc" != "0" ]; then die "$tic_out"; fi
fi fi
} }
@ -220,6 +222,7 @@ untar_and_read_env() {
mv_files_and_dirs "$tdir/home" "$HOME" mv_files_and_dirs "$tdir/home" "$HOME"
[ -e "$tdir/root" ] && mv_files_and_dirs "$tdir/root" "" [ -e "$tdir/root" ] && mv_files_and_dirs "$tdir/root" ""
command rm -rf "$tdir" command rm -rf "$tdir"
tdir=""
} }
read_record() { read_record() {