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

Use Python in preference to Perl

Browse Source
This commit is contained in:
pagedown 2022-03-08 13:59:32 +08:00
parent 65b9c69bd8
commit f1df7b1c1f
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,18 +10,6 @@ cleanup_on_bootstrap_exit() {
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; }
perl_detected="0"
detect_perl() {
if [ perl_detected = "1" ]; then
[ -n "$perl" ] && return 0;
return 1;
fi
perl_detected="1"
perl=$(command -v perl)
if [ -z "$perl" -o ! -x "$perl" ]; then perl=""; return 1; fi
return 0
}
python_detected="0" python_detected="0"
detect_python() { detect_python() {
if [ python_detected = "1" ]; then if [ python_detected = "1" ]; then
@ -36,6 +24,18 @@ detect_python() {
return 0 return 0
} }
perl_detected="0"
detect_perl() {
if [ perl_detected = "1" ]; then
[ -n "$perl" ] && return 0;
return 1;
fi
perl_detected="1"
perl=$(command -v perl)
if [ -z "$perl" -o ! -x "$perl" ]; then perl=""; return 1; fi
return 0
}
if command -v base64 > /dev/null 2> /dev/null; then if command -v base64 > /dev/null 2> /dev/null; then
base64_encode() { command base64 | command tr -d \\n\\r; } base64_encode() { command base64 | command tr -d \\n\\r; }
base64_decode() { command base64 -d; } base64_decode() { command base64 -d; }
@ -293,9 +293,9 @@ using_id() {
return 1 return 1
} }
using_perl() { using_python() {
if detect_perl; then if detect_python; then
output=$(command "$perl" -e 'my $shell = (getpwuid($<))[8]; print $shell') output=$(command "$python" -c "import pwd, os; print(pwd.getpwuid(os.geteuid()).pw_shell)")
if [ $? = 0 ]; then if [ $? = 0 ]; then
login_shell=$output login_shell=$output
if login_shell_is_ok; then return 0; fi if login_shell_is_ok; then return 0; fi
@ -304,9 +304,9 @@ using_perl() {
return 1 return 1
} }
using_python() { using_perl() {
if detect_python; then if detect_perl; then
output=$(command "$python" -c "import pwd, os; print(pwd.getpwuid(os.geteuid()).pw_shell)") output=$(command "$perl" -e 'my $shell = (getpwuid($<))[8]; print $shell')
if [ $? = 0 ]; then if [ $? = 0 ]; then
login_shell=$output login_shell=$output
if login_shell_is_ok; then return 0; fi if login_shell_is_ok; then return 0; fi
@ -326,16 +326,16 @@ using_passwd() {
return 1 return 1
} }
execute_with_perl() { execute_with_python() {
if detect_perl; then if detect_python; then
exec "$perl" "-e" "exec {'$login_shell'} '-$shell_name'" exec "$python" "-c" "import os; os.execlp('$login_shell', '-' '$shell_name')"
fi fi
return 1 return 1
} }
execute_with_python() { execute_with_perl() {
if detect_python; then if detect_perl; then
exec "$python" "-c" "import os; os.execlp('$login_shell', '-' '$shell_name')" exec "$perl" "-e" "exec {'$login_shell'} '-$shell_name'"
fi fi
return 1 return 1
} }
@ -344,7 +344,7 @@ if [ -n "$KITTY_LOGIN_SHELL" ]; then
login_shell="$KITTY_LOGIN_SHELL" login_shell="$KITTY_LOGIN_SHELL"
unset KITTY_LOGIN_SHELL unset KITTY_LOGIN_SHELL
else else
using_getent || using_id || using_perl || using_python || using_passwd || die "Could not detect login shell" using_getent || using_id || using_python || using_perl || using_passwd || die "Could not detect login shell"
fi fi
shell_name=$(command basename $login_shell) shell_name=$(command basename $login_shell)
[ -n "$login_cwd" ] && cd "$login_cwd" [ -n "$login_cwd" ] && cd "$login_cwd"
@ -432,6 +432,6 @@ esac
# to make sure the shell executes as a login shell. Note that not all shells # to make sure the shell executes as a login shell. Note that not all shells
# support exec -a so we use the below to try to detect such shells # support exec -a so we use the below to try to detect such shells
[ "$(exec -a echo echo OK 2> /dev/null)" = "OK" ] && exec -a "-$shell_name" $login_shell [ "$(exec -a echo echo OK 2> /dev/null)" = "OK" ] && exec -a "-$shell_name" $login_shell
execute_with_perl
execute_with_python execute_with_python
execute_with_perl
exec $login_shell "-l" exec $login_shell "-l"