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

...

Browse Source
This commit is contained in:
pagedown 2022-03-23 19:49:34 +08:00
parent a765d551e4
commit 8569be81ea
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/boss.py
View File

@ -1346,7 +1346,7 @@ class Boss:
# the system less before macOS 12.3 barfs up OSC codes, so sanitize them ourselves # the system less before macOS 12.3 barfs up OSC codes, so sanitize them ourselves
sentinel = os.path.join(cache_dir(), 'less-is-new-enough') sentinel = os.path.join(cache_dir(), 'less-is-new-enough')
if not os.path.exists(sentinel): if not os.path.exists(sentinel):
if less_version() >= 581: if less_version(cmd[0]) >= 581:
open(sentinel, 'w').close() open(sentinel, 'w').close()
else: else:
bdata = re.sub(br'\x1b\].*?\x1b\\', b'', bdata) bdata = re.sub(br'\x1b\].*?\x1b\\', b'', bdata)

2
kitty/rc/scroll_window.py
View File

@ -41,7 +41,7 @@ class ScrollWindow(RemoteCommand):
pages = 'p' in amt pages = 'p' in amt
unscroll = 'u' in amt unscroll = 'u' in amt
mult = -1 if amt.endswith('-') and not unscroll else 1 mult = -1 if amt.endswith('-') and not unscroll else 1
q = int(amt.rstrip('+-pu')) q = int(amt.rstrip('+-plu'))
amount = q * mult, 'p' if pages else ('u' if unscroll else 'l') amount = q * mult, 'p' if pages else ('u' if unscroll else 'l')
return {'match': opts.match, 'amount': amount} return {'match': opts.match, 'amount': amount}

2
kitty/utils.py
View File

@ -953,7 +953,7 @@ def macos_version() -> Tuple[int, ...]:
return tuple(map(int, platform.mac_ver()[0].split('.'))) return tuple(map(int, platform.mac_ver()[0].split('.')))
@run_once @lru_cache(maxsize=2)
def less_version(less_exe: str = 'less') -> int: def less_version(less_exe: str = 'less') -> int:
import subprocess import subprocess
o = subprocess.check_output([less_exe, '-V'], stderr=subprocess.STDOUT).decode() o = subprocess.check_output([less_exe, '-V'], stderr=subprocess.STDOUT).decode()

4
shell-integration/ssh/bootstrap-utils.sh
View File

@ -15,7 +15,6 @@ mv_files_and_dirs() {
cd "$cwd" cd "$cwd"
} }
compile_terminfo() { compile_terminfo() {
tname=".terminfo" tname=".terminfo"
# Ensure the 78 dir is present # Ensure the 78 dir is present
@ -40,7 +39,6 @@ compile_terminfo() {
fi fi
} }
parse_passwd_record() { parse_passwd_record() {
printf "%s" "$(command grep -o '[^:]*$')" printf "%s" "$(command grep -o '[^:]*$')"
} }
@ -152,7 +150,7 @@ execute_sh_with_posix_env() {
command "$login_shell" -l -c ":" > /dev/null 2> /dev/null && return command "$login_shell" -l -c ":" > /dev/null 2> /dev/null && return
[ -z "$shell_integration_dir" ] && die "Could not read data over tty ssh kitten cannot function" [ -z "$shell_integration_dir" ] && die "Could not read data over tty ssh kitten cannot function"
sh_dir="$shell_integration_dir/sh" sh_dir="$shell_integration_dir/sh"
command mkdir -p "$sh_dir" || die "Creating $sh_dir failed" command mkdir -p "$sh_dir" || die "Creating directory $sh_dir failed"
sh_script="$sh_dir/login_shell_env.sh" sh_script="$sh_dir/login_shell_env.sh"
# Source /etc/profile, ~/.profile, and then check and source ENV # Source /etc/profile, ~/.profile, and then check and source ENV
printf "%s" ' printf "%s" '