dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 18:38:00 +00:00
Code Issues Releases Wiki Activity

Merge upstream/master

Browse Source
This commit is contained in:
Daniel Carrillo 2022-08-26 19:40:40 +02:00
commit 77edfff10e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ssh/init.zsh
View File

@ -52,9 +52,9 @@ if ssh-add -l 2>&1 | grep -q 'The agent has no identities'; then
# program specified by SSH_ASKPASS and open an X11 window to read the # program specified by SSH_ASKPASS and open an X11 window to read the
# passphrase. # passphrase.
if [[ -n "$DISPLAY" && -x "$SSH_ASKPASS" ]]; then if [[ -n "$DISPLAY" && -x "$SSH_ASKPASS" ]]; then
ssh-add ${_ssh_identities:+$_ssh_dir/${^_ssh_identities[@]}} < /dev/null 2> /dev/null ssh-add ${_ssh_identities:+$_ssh_dir/${^~_ssh_identities[@]}} < /dev/null 2> /dev/null
else else
ssh-add ${_ssh_identities:+$_ssh_dir/${^_ssh_identities[@]}} 2> /dev/null ssh-add ${_ssh_identities:+$_ssh_dir/${^~_ssh_identities[@]}} 2> /dev/null
fi fi
fi fi

10
modules/utility/init.zsh
View File

@ -196,12 +196,14 @@ fi
# Serves a directory via HTTP. # Serves a directory via HTTP.
if (( $#commands[(i)python(|[23])] )); then if (( $#commands[(i)python(|[23])] )); then
autoload -Uz is-at-least autoload -Uz is-at-least
if is-at-least 3 ${"$(python --version 2>&1)"[(w)2]}; then if (( $+commands[python3] )); then
alias http-serve='python -m http.server'
elif (( $+commands[python3] )); then
alias http-serve='python3 -m http.server' alias http-serve='python3 -m http.server'
elif (( $+commands[python2] )); then
alias http-serve='python2 -m SimpleHTTPServer'
elif is-at-least 3 ${"$(python --version 2>&1)"[(w)2]}; then
alias http-serve='python -m http.server'
else else
alias http-serve='$commands[(i)python(|2)] -m SimpleHTTPServer' alias http-serve='python -m SimpleHTTPServer'
fi fi
fi fi