Browse Source

feat(wd): update to 7054de2b (#12675)

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>
ohmyzsh[bot] 2 months ago
parent
commit
f709cd4548
4 changed files with 12 additions and 24 deletions
  1. 1 1
      .github/dependencies.yml
  2. 7 10
      plugins/wd/README.md
  3. 1 2
      plugins/wd/wd.plugin.zsh
  4. 3 11
      plugins/wd/wd.sh

+ 1 - 1
.github/dependencies.yml

@@ -28,7 +28,7 @@ dependencies:
   plugins/wd:
   plugins/wd:
     repo: mfaerevaag/wd
     repo: mfaerevaag/wd
     branch: master
     branch: master
-    version: tag:v0.7.1
+    version: tag:v0.9.0
     precopy: |
     precopy: |
       set -e
       set -e
       rm -r test
       rm -r test

+ 7 - 10
plugins/wd/README.md

@@ -115,9 +115,11 @@ wd() {
 
 
 3. Install manpage (optional):
 3. Install manpage (optional):
 
 
+Move manpage into an appropriate directory, then trigger `mandb` to discover it
+
 ```zsh
 ```zsh
-sudo cp ~/.local/wd/wd.1 /usr/share/man/man1/wd.1
-sudo chmod 644 /usr/share/man/man1/wd.1
+sudo install -m 644 ~/.local/wd/wd.1 /usr/share/man/man1/wd.1
+sudo mandb /usr/share/man/man1
 ```
 ```
 
 
 **Note:** when pulling and updating `wd`, you'll need to repeat step 3 should the manpage change
 **Note:** when pulling and updating `wd`, you'll need to repeat step 3 should the manpage change
@@ -139,10 +141,11 @@ rm -f ~/.zcompdump; compinit
 
 
 ## Browse
 ## Browse
 
 
-If you want to make use of the `fzf`-powered browse feature to fuzzy search through all your warp points, set up a keybind in your `.zshrc`:
+`wd` comes with an `fzf`-powered browse feature to fuzzy search through all your warp points. It's available through the `wd browse` command. For quick access you can set up an alias or keybind in your `.zshrc`:
 
 
 ```zsh
 ```zsh
-bindkey ${FZF_WD_BINDKEY:-'^B'} fuzzy_wd_widget
+# ctrl-b to open the fzf browser
+bindkey ${FZF_WD_BINDKEY:-'^B'} wd_browse_widget
 ```
 ```
 
 
 ## Usage
 ## Usage
@@ -255,12 +258,6 @@ wd --version
 wd --config ./file <command>
 wd --config ./file <command>
 ```
 ```
 
 
-* Force `exit` with return code after running. This is not default, as it will *exit your terminal*, though required for testing/debugging.
-
-```zsh
-wd --debug <command>
-```
-
 * Silence all output:
 * Silence all output:
 
 
 ```zsh
 ```zsh

+ 1 - 2
plugins/wd/wd.plugin.zsh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 
 
 # WARP DIRECTORY
 # WARP DIRECTORY
 # ==============
 # ==============
@@ -18,4 +18,3 @@ zle -N wd_browse_widget
 zle -N wd_restore_buffer
 zle -N wd_restore_buffer
 autoload -Uz add-zle-hook-widget
 autoload -Uz add-zle-hook-widget
 add-zle-hook-widget line-init wd_restore_buffer
 add-zle-hook-widget line-init wd_restore_buffer
-bindkey ${FZF_WD_BINDKEY:-'^B'} wd_browse_widget

+ 3 - 11
plugins/wd/wd.sh

@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 
 
 # WARP DIRECTORY
 # WARP DIRECTORY
 # ==============
 # ==============
@@ -8,7 +8,7 @@
 # @github.com/mfaerevaag/wd
 # @github.com/mfaerevaag/wd
 
 
 # version
 # version
-readonly WD_VERSION=0.7.0
+readonly WD_VERSION=0.9.0
 
 
 # colors
 # colors
 readonly WD_BLUE="\033[96m"
 readonly WD_BLUE="\033[96m"
@@ -90,7 +90,6 @@ Commands:
     clean                Remove points warping to nonexistent directories (will prompt unless --force is used)
     clean                Remove points warping to nonexistent directories (will prompt unless --force is used)
 
 
     -v | --version  Print version
     -v | --version  Print version
-    -d | --debug    Exit after execution with exit codes (for testing)
     -c | --config   Specify config file (default ~/.warprc)
     -c | --config   Specify config file (default ~/.warprc)
     -q | --quiet    Suppress all output
     -q | --quiet    Suppress all output
     -f | --force    Allows overwriting without warning (for add & clean)
     -f | --force    Allows overwriting without warning (for add & clean)
@@ -426,7 +425,6 @@ wd_export_static_named_directories() {
 WD_CONFIG=${WD_CONFIG:-$HOME/.warprc}
 WD_CONFIG=${WD_CONFIG:-$HOME/.warprc}
 local WD_QUIET=0
 local WD_QUIET=0
 local WD_EXIT_CODE=0
 local WD_EXIT_CODE=0
-local WD_DEBUG=0
 
 
 # Parse 'meta' options first to avoid the need to have them before
 # Parse 'meta' options first to avoid the need to have them before
 # other commands. The `-D` flag consumes recognized options so that
 # other commands. The `-D` flag consumes recognized options so that
@@ -436,7 +434,6 @@ zparseopts -D -E \
     c:=wd_alt_config -config:=wd_alt_config \
     c:=wd_alt_config -config:=wd_alt_config \
     q=wd_quiet_mode -quiet=wd_quiet_mode \
     q=wd_quiet_mode -quiet=wd_quiet_mode \
     v=wd_print_version -version=wd_print_version \
     v=wd_print_version -version=wd_print_version \
-    d=wd_debug_mode -debug=wd_debug_mode \
     f=wd_force_mode -force=wd_force_mode
     f=wd_force_mode -force=wd_force_mode
 
 
 if [[ ! -z $wd_print_version ]]
 if [[ ! -z $wd_print_version ]]
@@ -583,9 +580,4 @@ unset args
 unset points
 unset points
 unset val &> /dev/null # fixes issue #1
 unset val &> /dev/null # fixes issue #1
 
 
-if [[ -n $wd_debug_mode ]]
-then
-    exit $WD_EXIT_CODE
-else
-    unset wd_debug_mode
-fi
+return $WD_EXIT_CODE