refactor(installer): reuse timestamp for backup naming loop

Co-authored-by: robbyrussell <257+robbyrussell@users.noreply.github.com>

lib/vcs_info.zsh

@@ -38,47 +38,16 @@
 # due to malicious input as a consequence of CVE-2021-45444, which affects
 # zsh versions from 5.0.3 to 5.8.
 #
-# The patch is applied when VCS_INFO_formats is first called, since loading
-# and patching it on every startup costs time in shells that never use
-# vcs_info. `autoload` doesn't replace an already defined function, so this
-# wrapper survives a later `autoload -Uz vcs_info` in a theme or .zshrc, and
-# vcs_info's own `autoload -Uz VCS_INFO_formats`.
-if (( $+functions[VCS_INFO_formats] )); then
-  () {
-    autoload -Uz +X regexp-replace 2>/dev/null || return 1
+autoload -Uz +X regexp-replace VCS_INFO_formats 2>/dev/null || return 0
 
-    # We use $tmp here because it's already a local variable in VCS_INFO_formats
-    local PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
-    # Unique string to avoid reapplying the patch if this code gets called twice
-    local PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
-    # Only patch the VCS_INFO_formats function if not already patched
-    if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
-      regexp-replace 'functions[VCS_INFO_formats]' \
-        "VCS_INFO_hook 'post-backend'" \
-        ': ${PATCH_ID}; ${PATCH}; ${MATCH}'
-    fi
-  }
-else
-  function VCS_INFO_formats {
-    local loaded_function="$(
-      unfunction VCS_INFO_formats 2>/dev/null
-      autoload -Uz +X VCS_INFO_formats 2>/dev/null || return 1
-      print -r -- "$functions[VCS_INFO_formats]"
-    )" || return 1
-    functions[VCS_INFO_formats]="$loaded_function"
-    autoload -Uz +X regexp-replace 2>/dev/null || return 1
-
-    # We use $tmp here because it's already a local variable in VCS_INFO_formats
-    local PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
-    # Unique string to avoid reapplying the patch if this code gets called twice
-    local PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
-    # Only patch the VCS_INFO_formats function if not already patched
-    if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
-      regexp-replace 'functions[VCS_INFO_formats]' \
-        "VCS_INFO_hook 'post-backend'" \
-        ': ${PATCH_ID}; ${PATCH}; ${MATCH}'
-    fi
-
-    VCS_INFO_formats "$@"
-  }
+# We use $tmp here because it's already a local variable in VCS_INFO_formats
+typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
+# Unique string to avoid reapplying the patch if this code gets called twice
+typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
+# Only patch the VCS_INFO_formats function if not already patched
+if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
+  regexp-replace 'functions[VCS_INFO_formats]' \
+    "VCS_INFO_hook 'post-backend'" \
+    ': ${PATCH_ID}; ${PATCH}; ${MATCH}'
 fi
+unset PATCH PATCH_ID

plugins/kubectl/README.md

@@ -71,7 +71,6 @@ plugins=(... kubectl)
 |          |                                                         | **Secret management**                                                                            |
 | kgsec    | `kubectl get secret`                                    | Get secret for decoding                                                                          |
 | kgseca   | `kubectl get secret --all-namespaces`                   | List secrets across all namespaces                                                               |
-| kesec    | `kubectl edit secret`                                   | Edit secret resource                                                                             |
 | kdsec    | `kubectl describe secret`                               | Describe secret resource in detail                                                               |
 | kdelsec  | `kubectl delete secret`                                 | Delete the secret                                                                                |
 |          |                                                         | **Deployment management**                                                                        |

plugins/kubectl/kubectl.plugin.zsh

@@ -93,7 +93,6 @@ alias kdelcm='kubectl delete configmap'
 # Secret management
 alias kgsec='kubectl get secret'
 alias kgseca='kubectl get secret --all-namespaces'
-alias kesec='kubectl edit secret'
 alias kdsec='kubectl describe secret'
 alias kdelsec='kubectl delete secret'
 

plugins/symfony6/symfony6.plugin.zsh

@@ -15,8 +15,8 @@
 #   - https://github.com/symfony/symfony/blob/5.4/src/Symfony/Component/Console/Resources/completion.bash
 #
 _sf_console() {
-    local lastParam out comp sf_cmd
-    local -a completions flagPrefix requestComp inputs
+    local lastParam flagPrefix requestComp out comp
+    local -a completions
 
     # The user could have moved the cursor backwards on the command-line.
     # We need to trigger completion from the $CURRENT location, so we need
@@ -29,20 +29,11 @@ _sf_console() {
     setopt local_options BASH_REMATCH
     if [[ "${lastParam}" =~ '-.*=' ]]; then
         # We are dealing with a flag with an =
-        flagPrefix=(-P "${BASH_REMATCH}")
+        flagPrefix="-P ${BASH_REMATCH}"
     fi
 
-    # Prepare the command to obtain completions. An alias is resolved here,
-    # because the request is no longer read again by the shell.
-    sf_cmd="${words[1]}"
-    if [[ -n "${aliases[$sf_cmd]}" ]]; then
-        requestComp=(${(z)aliases[$sf_cmd]})
-    else
-        requestComp=(${~sf_cmd})
-    fi
-
-    requestComp+=(_complete --no-interaction -szsh -a1 "-c$((CURRENT-1))")
-
+    # Prepare the command to obtain completions
+    requestComp="${words[0]} ${words[1]} _complete --no-interaction -szsh -a1 -c$((CURRENT-1))" i=""
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
@@ -56,18 +47,19 @@ _sf_console() {
         fi
         # empty values are ignored
         if [ ! -z "$w" ]; then
-            inputs+=("-i$w")
+            i="${i}-i${w} "
         fi
     done
 
     # Ensure at least 1 input
-    if (( ! $#inputs )); then
-        inputs=(-i' ')
+    if [ "${i}" = "" ]; then
+        requestComp="${requestComp} -i\" \""
+    else
+        requestComp="${requestComp} ${i}"
     fi
 
-    # The request is run without being read again by the shell, so that a
-    # "$(...)" or a backtick typed on the command line is not executed
-    out=$(SHELL_VERBOSITY=0 "${requestComp[@]}" "${inputs[@]}" 2>/dev/null)
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
 
     while IFS='\n' read -r comp; do
         if [ -n "$comp" ]; then
@@ -83,7 +75,7 @@ _sf_console() {
     done < <(printf "%s\n" "${out[@]}")
 
     # Let inbuilt _describe handle completions
-    _describe "completions" completions "${flagPrefix[@]}"
+    eval _describe "completions" completions $flagPrefix
     return $?
 }
 

tools/install.sh

@@ -370,6 +370,7 @@ setup_zshrc() {
       # Ask user for confirmation before backing up and overwriting
       echo "${FMT_YELLOW}Found ${zdot}/.zshrc."
       echo "The existing .zshrc will be backed up to .zshrc.pre-oh-my-zsh if overwritten."
+      echo "Your command history will be backed up too, since replacing .zshrc drops any SAVEHIST you had set."
       echo "Make sure your .zshrc contains the following minimal configuration if you choose not to overwrite it:${FMT_RESET}"
       echo "----------------------------------------"
       cat "$ZSH/templates/minimal.zshrc"
@@ -398,6 +399,44 @@ setup_zshrc() {
     fi
     echo "${FMT_GREEN}Backing up to ${OLD_ZSHRC}${FMT_RESET}"
     mv "$zdot/.zshrc" "$OLD_ZSHRC"
+
+    # The .zshrc we just moved aside is where the user's SAVEHIST lived. Without
+    # it zsh trims $HISTFILE the next time a shell exits, so copy the history
+    # while it is still intact. $HISTFILE is a zsh variable we cannot read from
+    # here, so cover both locations it is commonly given: /etc/zshrc on macOS
+    # sets ${ZDOTDIR:-$HOME}/.zsh_history, and lib/history.zsh falls back to
+    # $HOME/.zsh_history.
+    hist_backed_up=""
+    for hist in "$zdot/.zsh_history" "$HOME/.zsh_history"; do
+      if [ ! -f "$hist" ]; then
+        continue
+      fi
+      case " $hist_backed_up " in
+        *" $hist "*) continue ;;
+      esac
+      hist_backup_base="${hist}.pre-oh-my-zsh"
+      hist_backup="$hist_backup_base"
+      if [ -e "$hist_backup" ]; then
+        hist_backup_ts="$(date +%Y-%m-%d_%H-%M-%S)"
+        hist_backup_i=0
+        while [ -e "$hist_backup" ]; do
+          hist_backup_i=$((hist_backup_i + 1))
+          hist_backup="${hist_backup_base}-${hist_backup_ts}-${hist_backup_i}"
+        done
+      fi
+      if cp -p "$hist" "$hist_backup"; then
+        echo "${FMT_GREEN}Backing up your command history to ${hist_backup}${FMT_RESET}"
+        hist_backed_up="$hist_backed_up $hist"
+      else
+        # a half-written file would look like a usable backup
+        rm -f "$hist_backup"
+        fmt_error "could not back up $hist"
+        if ! mv "$OLD_ZSHRC" "$zdot/.zshrc"; then
+          fmt_error "could not restore $zdot/.zshrc from backup"
+        fi
+        exit 1
+      fi
+    done
   fi
 
   echo "${FMT_GREEN}Using the Oh My Zsh template file and adding it to $zdot/.zshrc.${FMT_RESET}"