diff --git a/shell-integration/ssh/bootstrap-utils.sh b/shell-integration/ssh/bootstrap-utils.sh index 49bfe15a1..90f1e4412 100644 --- a/shell-integration/ssh/bootstrap-utils.sh +++ b/shell-integration/ssh/bootstrap-utils.sh @@ -6,6 +6,16 @@ # Distributed under terms of the MIT license. # +mv_files_and_dirs() { + cwd="$PWD" + cd "$1" + command find . -type d -exec mkdir -p "$2/{}" ";" + command find . -type l -exec sh -c "tgt=\$(command readlink -n \"{}\"); command ln -snf \"\$tgt\" \"$2/{}\"; command rm -f \"{}\"" ";" + command find . -type f -exec mv "{}" "$2/{}" ";" + cd "$cwd" +} + + compile_terminfo() { tname=".terminfo" # Ensure the 78 dir is present diff --git a/shell-integration/ssh/bootstrap.sh b/shell-integration/ssh/bootstrap.sh index 3be7d59ff..137399eff 100644 --- a/shell-integration/ssh/bootstrap.sh +++ b/shell-integration/ssh/bootstrap.sh @@ -78,15 +78,6 @@ trap "cleanup_on_bootstrap_exit" EXIT dcs_to_kitty "ssh" "id="REQUEST_ID":pwfile="PASSWORD_FILENAME":pw="DATA_PASSWORD"" } -mv_files_and_dirs() { - cwd="$PWD" - cd "$1" - command find . -type d -exec mkdir -p "$2/{}" ";" - command find . -type l -exec sh -c "tgt=\$(command readlink -n \"{}\"); command ln -snf \"\$tgt\" \"$2/{}\"; command rm -f \"{}\"" ";" - command find . -type f -exec mv "{}" "$2/{}" ";" - cd "$cwd" -} - read_base64_from_tty() { while IFS= read -r line; do [ "$line" = "KITTY_DATA_END" ] && return 0