chore: cleanup examples and variable names

benelan · Feb 5, 2024 · 5d32c57 · 5d32c57
1 parent e3fdcd6
commit 5d32c57
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -195,7 +195,7 @@ You can set the [`FZF_DEFAULT_OPTS`](https://github.com/junegunn/fzf/blob/master
 environment variable to add/change `fzf` options used by `gh-fzf` commands.
 
 For example, create aliases in the `gh` config file that add new keybindings to
-the issue command for assigning and un-assigning yourself:
+the issue and pr commands:
 
 ```yml
 # ~/.config/gh/config.yml
@@ -205,17 +205,9 @@ aliases:
       --bind='alt-+:execute(gh issue edit --add-assignee @me {1})'
       --bind='alt--:execute(gh issue edit --remove-assignee @me {1})'
     " gh fzf issue
-```
-
-Or change the default keybinding for merging pull requests to delete the branch
-afterward:
-
-```yml
-# ~/.config/gh/config.yml
-aliases:
   p: |
     !FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS
-      --bind='alt-M:execute(gh pr merge --delete-branch {1})'
+      --bind='alt-m:execute(gh pr merge --delete-branch --squash {1})'
       " gh fzf pr
 ```
 

diff --git a/gh-fzf b/gh-fzf
@@ -87,15 +87,15 @@ if [ -z "$GH_FZF_COPY_CMD" ]; then
 fi
 
 if [ -n "$GH_FZF_HIDE_HINTS" ]; then
-    _start="toggle-header"
+    on_start="toggle-header"
 else
-    _start=""
+    on_start=""
 fi
 
 if [ -n "$GH_FZF_TRUNCATE_FIELDS" ]; then
-    _columns='100%'
+    gh_columns='100%'
 else
-    _columns='9999999'
+    gh_columns='9999999'
 fi
 
 # The following fzf options are shared by all commands. They are prepended to
@@ -125,9 +125,9 @@ FZF_DEFAULT_OPTS='
 # --------------------------------------------------------------------- {|}
 
 default_cmd() {
-    FZF_DEFAULT_COMMAND="printf 'COMMAND\nissue\npr\nrun\n'" \
+    FZF_DEFAULT_COMMAND="printf 'COMMAND\n%s\n%s\n%s\n' 'issue' 'pr' 'run'" \
         fzf \
-        --preview='GH_FORCE_TTY=$FZF_PREVIEW_COLUMNS gh {} --help' \
+        --preview='GH_FORCE_TTY=$FZF_PREVIEW_COLUMNS gh help {}' \
         --preview-window='right:75%,wrap' \
         --bind="enter:execute(gh fzf {})"
 }
@@ -178,11 +178,11 @@ Filters > (alt-a: assignee) (alt-A: author) (alt-m: mention) (alt-s: state=all)
 
 '
 
-    FZF_DEFAULT_COMMAND="GH_FORCE_TTY=$_columns gh issue list $issue_template -L $GH_FZF_DEFAULT_LIMIT $*" \
+    FZF_DEFAULT_COMMAND="GH_FORCE_TTY=$gh_columns gh issue list $issue_template -L $GH_FZF_DEFAULT_LIMIT $*" \
         fzf \
-        --preview 'GH_FORCE_TTY=$FZF_PREVIEW_COLUMNS gh issue view {1} --comments' \
+        --preview='GH_FORCE_TTY=$FZF_PREVIEW_COLUMNS gh issue view {1} --comments' \
         --header="$issue_header" \
-        --bind="start:$_start" \
+        --bind="start:$on_start" \
         --bind='ctrl-o:execute-silent(gh issue view --web {1})' \
         --bind="ctrl-y:execute-silent(gh issue view {1} --json 'url' -q '.url' | $GH_FZF_COPY_CMD)" \
         --bind='enter:execute(gh issue edit {1})' \
@@ -245,11 +245,11 @@ Filters > (alt-a: assignee) (alt-A: author) (alt-b: branch) (alt-s: state=all)
 
 '
 
-    FZF_DEFAULT_COMMAND="GH_FORCE_TTY=$_columns gh pr list $pr_template -L $GH_FZF_DEFAULT_LIMIT $*" \
+    FZF_DEFAULT_COMMAND="GH_FORCE_TTY=$gh_columns gh pr list $pr_template -L $GH_FZF_DEFAULT_LIMIT $*" \
         fzf \
-        --preview 'GH_FORCE_TTY=$FZF_PREVIEW_COLUMNS gh pr view {1} --comments' \
+        --preview='GH_FORCE_TTY=$FZF_PREVIEW_COLUMNS gh pr view {1} --comments' \
         --header="$pr_header" \
-        --bind="start:$_start" \
+        --bind="start:$on_start" \
         --bind='ctrl-o:execute-silent(gh pr view --web {1})' \
         --bind="ctrl-y:execute-silent(gh pr view {1} --json 'url' -q '.url' | $GH_FZF_COPY_CMD)" \
         --bind='enter:execute(gh pr edit {1})' \
@@ -326,11 +326,11 @@ Filters > (alt-f: failed runs) (alt-b: current branch) (alt-u: current user)
 
 '
 
-    FZF_DEFAULT_COMMAND="GH_FORCE_TTY=$_columns gh run list $run_template -L $GH_FZF_DEFAULT_LIMIT $*" \
+    FZF_DEFAULT_COMMAND="GH_FORCE_TTY=$gh_columns gh run list $run_template -L $GH_FZF_DEFAULT_LIMIT $*" \
         fzf \
-        --preview 'GH_FORCE_TTY=$FZF_PREVIEW_COLUMNS gh run view {-1}' \
+        --preview='GH_FORCE_TTY=$FZF_PREVIEW_COLUMNS gh run view {-1}' \
         --header="$run_header" \
-        --bind="start:$_start" \
+        --bind="start:$on_start" \
         --bind='ctrl-o:execute-silent(gh run view --web {-1})' \
         --bind="ctrl-y:execute-silent(gh run view {-1} --json 'url' -q '.url' | $GH_FZF_COPY_CMD)" \
         --bind='enter:execute(gh run watch {-1})' \