Merge upstream/master

feat(module/ssh): add globbing for ssh-add param
fixes #2000 Signed-off-by: Shea690901 <ginny690901@hotmail.de>
2022-08-26 19:40:40 +02:00 · 2022-08-03 18:52:34 -05:00 · 2022-08-03 18:51:49 -05:00 · 2022-08-03 18:51:49 -05:00
2 changed files with 8 additions and 6 deletions
--- a/modules/ssh/init.zsh
+++ b/modules/ssh/init.zsh
@ -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
  # passphrase.
  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
-    ssh-add ${_ssh_identities:+$_ssh_dir/${^_ssh_identities[@]}} 2> /dev/null
+    ssh-add ${_ssh_identities:+$_ssh_dir/${^~_ssh_identities[@]}} 2> /dev/null
  fi
 fi

--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@ -196,12 +196,14 @@ fi
 # Serves a directory via HTTP.
 if (( $#commands[(i)python(|[23])] )); then
  autoload -Uz is-at-least
-  if is-at-least 3 ${"$(python --version 2>&1)"[(w)2]}; then
-    alias http-serve='python -m http.server'
-  elif (( $+commands[python3] )); then
+  if (( $+commands[python3] )); then
    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
-    alias http-serve='$commands[(i)python(|2)] -m SimpleHTTPServer'
+    alias http-serve='python -m SimpleHTTPServer'
  fi
 fi
Author	SHA1	Message	Date
Daniel Carrillo	77edfff10e	Merge upstream/master	2022-08-26 19:40:40 +02:00
Shea690901	51c4ff6de4	feat(module/ssh): add globbing for ssh-add param fixes #2000 Signed-off-by: Shea690901 <ginny690901@hotmail.de>	2022-08-03 18:52:34 -05:00
Indrajit Raychaudhuri	3ea20cfbe8	utility: Make 'http-serve' handler faster for well known cases In most systems, python2 or python3 command/soft-link would almost always exist. In such cases, we don't need to invoke `python` to detect the version. This should speed things up a bit as well.	2022-08-03 18:51:49 -05:00
Indrajit Raychaudhuri	0aef8086b5	completion: Update completion submodule to 0.34.0	2022-08-03 18:51:49 -05:00