chore(ansible): zsh-ify some code (#13797)

Co-authored-by: Lucas Ma <7184042+pony-maggie@users.noreply.github.com>

README.md

@@ -466,15 +466,6 @@ zstyle ':omz:update' frequency 7
 zstyle ':omz:update' frequency 0
 ```
 
-By default, updates always pull the latest changes. If you'd rather let others kick the tires first
-before an update reaches your machine, you can set a cooldown (in days). You'll still get everything —
-just a little later:
-
-```sh
-# Only apply updates that are at least 10 days old
-zstyle ':omz:update' cooldown 10
-```
-
 ### Updates Verbosity
 
 You can also limit the update verbosity with the following settings:

lib/git.zsh

@@ -162,13 +162,13 @@ if zstyle -t ':omz:alpha:lib:git' async-prompt \
   # or any of the other prompt variables
   function _defer_async_git_register() {
     # Check if git_prompt_info is used in a prompt variable
-    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
+    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT-}:${RPS1-}:${RPS2-}:${RPS3-}:${RPS4-}" in
     *(\$\(git_prompt_info\)|\`git_prompt_info\`)*)
       _omz_register_handler _omz_git_prompt_info
       ;;
     esac
 
-    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
+    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT-}:${RPS1-}:${RPS2-}:${RPS3-}:${RPS4-}" in
     *(\$\(git_prompt_status\)|\`git_prompt_status\`)*)
       _omz_register_handler _omz_git_prompt_status
       ;;

plugins/ansible/ansible.plugin.zsh

@@ -1,13 +1,13 @@
 # Functions
-function ansible-version(){
+function ansible-version() {
     ansible --version
 }
 
-function ansible-role-init(){
+function ansible-role-init() {
-    if ! [ -z $1 ] ; then
+    if [[ -n "$1" ]]; then
         echo "Ansible Role : $1 Creating...."
-        ansible-galaxy init $1
+        ansible-galaxy init "$1"
-        tree $1
+        tree "$1"
     else
         echo "Usage : ansible-role-init <role name>"
         echo "Example : ansible-role-init role1"

plugins/aws/aws.plugin.zsh

@@ -9,14 +9,14 @@ function agr() {
 # Update state file if enabled
 function _aws_update_state() {
   if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
-    test -d $(dirname ${AWS_STATE_FILE}) || exit 1
+    test -d $(dirname ${AWS_STATE_FILE}) || return 1
     echo "${AWS_PROFILE} ${AWS_REGION}" > "${AWS_STATE_FILE}"
   fi
 }
 
 function _aws_clear_state() {
   if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
-    test -d $(dirname ${AWS_STATE_FILE}) || exit 1
+    test -d $(dirname ${AWS_STATE_FILE}) || return 1
     echo -n > "${AWS_STATE_FILE}"
   fi
 }

plugins/dnf/README.md

@@ -15,18 +15,19 @@ of `dnf5` and uses it as drop-in alternative to the slower `dnf`.
 
 ## Aliases
 
-| Alias | Command                 | Description              |
+| Alias | Command                       | Description                              |
-|-------|-------------------------|--------------------------|
+|-------|-------------------------------|------------------------------------------|
-| dnfl  | `dnf list`              | List packages            |
+| dnfl  | `dnf list`                    | List packages                            |
-| dnfli | `dnf list --installed`  | List installed packages  |
+| dnfli | `dnf list --installed`        | List installed packages                  |
-| dnfgl | `dnf grouplist`         | List package groups      |
+| dnfgl | `dnf grouplist`               | List package groups                      |
-| dnfmc | `dnf makecache`         | Generate metadata cache  |
+| dnfmc | `dnf makecache`               | Generate metadata cache                  |
-| dnfp  | `dnf info`              | Show package information |
+| dnfp  | `dnf info`                    | Show package information                 |
-| dnfs  | `dnf search`            | Search package           |
+| dnfs  | `dnf search`                  | Search package                           |
-| **Use `sudo`**                                             |
+| **Use `sudo`**                                                                      |
-| dnfu  | `sudo dnf upgrade`      | Upgrade package          |
+| dnfu  | `sudo dnf upgrade`            | Upgrade package                          |
-| dnfi  | `sudo dnf install`      | Install package          |
+| dnfur | `sudo dnf upgrade --refresh`  | Upgrade package (force metadata refresh) |
-| dnfgi | `sudo dnf groupinstall` | Install package group    |
+| dnfi  | `sudo dnf install`            | Install package                          |
-| dnfr  | `sudo dnf remove`       | Remove package           |
+| dnfgi | `sudo dnf groupinstall`       | Install package group                    |
-| dnfgr | `sudo dnf groupremove`  | Remove package group     |
+| dnfr  | `sudo dnf remove`             | Remove package                           |
-| dnfc  | `sudo dnf clean all`    | Clean cache              |
+| dnfgr | `sudo dnf groupremove`        | Remove package group                     |
+| dnfc  | `sudo dnf clean all`          | Clean cache                              |

plugins/dnf/dnf.plugin.zsh

@@ -11,6 +11,7 @@ alias dnfp="${dnfprog} info"                       # Show package information
 alias dnfs="${dnfprog} search"                     # Search package
 
 alias dnfu="sudo ${dnfprog} upgrade"               # Upgrade package
+alias dnfur="sudo ${dnfprog} upgrade --refresh"    # Upgrade package and refresh repos
 alias dnfi="sudo ${dnfprog} install"               # Install package
 alias dnfr="sudo ${dnfprog} remove"                # Remove package
 alias dnfc="sudo ${dnfprog} clean all"             # Clean cache

plugins/macports/macports.plugin.zsh

@@ -8,7 +8,7 @@ alias puo="sudo port upgrade outdated"
 alias pup="sudo port selfupdate && sudo port upgrade outdated"
 
 port-livecheck-maintainer() {
-  (( ${+commands[port]} == 0 )) || {
+  (( ${+commands[port]} )) || {
     print -- "port: not found" >&2
     return 1
   }

plugins/vi-mode/vi-mode.plugin.zsh

@@ -26,7 +26,7 @@ typeset -g VI_MODE_CURSOR_OPPEND=${VI_MODE_CURSOR_OPPEND:=0}
 typeset -g VI_KEYMAP=${VI_KEYMAP:=main}
 
 function _vi-mode-set-cursor-shape-for-keymap() {
-  [[ "$VI_MODE_SET_CURSOR" = true ]] || return
+  [[ "$VI_MODE_SET_CURSOR" = true ]] || return 0
 
   # https://vt100.net/docs/vt510-rm/DECSCUSR
   local _shape=0

templates/zshrc.zsh-template

@@ -28,12 +28,9 @@ ZSH_THEME="robbyrussell"
 # zstyle ':omz:update' mode auto      # update automatically without asking
 # zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 
-# Uncomment the following line to change the frequency the auto-updater is run (in days).
+# Uncomment the following line to change how often to auto-update (in days).
 # zstyle ':omz:update' frequency 13
 
-# Uncomment the following line to set how old an update must be before it's applied, manually or via the auto-updater (in days).
-# zstyle ':omz:update' cooldown 10
-
 # Uncomment the following line if pasting URLs and other text is messed up.
 # DISABLE_MAGIC_FUNCTIONS="true"
 

tools/install.sh

@@ -473,7 +473,7 @@ EOF
   # be prompted for the password either way, so this shouldn't cause any issues.
   #
   if user_can_sudo; then
-    sudo -k >/dev/null 2>&1         # -k forces the password prompt
+    sudo -k >/dev/null 2>&1 || true # -k forces the password prompt when supported
     sudo chsh -s "$zsh" "$USER"
   else
     chsh -s "$zsh" "$USER"          # run chsh normally

tools/upgrade.sh

@@ -231,10 +231,6 @@ local ret=0
 remote=${"$(git config --local oh-my-zsh.remote)":-origin}
 branch=${"$(git config --local oh-my-zsh.branch)":-master}
 
-# cooldown: minimum age (in days) of commits to apply
-local cooldown_days
-zstyle -s ':omz:update' cooldown cooldown_days || cooldown_days=0
-
 # repository state
 last_head=$(git symbolic-ref --quiet --short HEAD || git rev-parse HEAD)
 # checkout update branch
@@ -246,20 +242,7 @@ last_commit=$(git rev-parse "$branch")
 if [[ $verbose_mode != silent ]]; then
   printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
 fi
-if {
+if LANG= git pull --quiet --rebase $remote $branch; then
-  if (( cooldown_days > 0 )); then
-    zmodload zsh/datetime
-    local cutoff_epoch cooldown_ref
-    cutoff_epoch=$(( EPOCHSECONDS - cooldown_days * 86400 ))
-    LANG= git fetch --quiet $remote $branch && {
-      cooldown_ref=$(git log --format="%H %ct" "$remote/$branch" \
-        | awk -v c="$cutoff_epoch" '$2 <= c { print $1; exit }')
-      [[ -z "$cooldown_ref" ]] || LANG= git merge --ff-only --quiet "$cooldown_ref"
-    }
-  else
-    LANG= git pull --quiet --rebase $remote $branch
-  fi
-}; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
     message="Oh My Zsh is already at the latest version."