Skip to content

Commit

Permalink
Widget: fix behavior for % (#368)
Browse files Browse the repository at this point in the history
  • Loading branch information
@denisidoro
denisidoro authored Jul 10, 2020
1 parent 4147d9b commit 231f977
Show file tree
Hide file tree
Showing 8 changed files with 122 additions and 43 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "navi"
version = "2.7.0"
version = "2.7.1"
authors = ["Denis Isidoro <[email protected]>"]
edition = "2018"
description = "An interactive cheatsheet tool for the command-line"
Expand Down
4 changes: 3 additions & 1 deletion alfred/alfred0.bash
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/bash

source "${HOME}/.bashrc"
export PATH="/usr/local/bin:$PATH"

if [ -n "${snippet:-}" ]; then
source "${HOME}/.bashrc"
echo -n "$(navi alfred check)"
else
echo -n "__start"
Expand Down
9 changes: 7 additions & 2 deletions alfred/alfred1.bash
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
#!/bin/bash

source "${HOME}/.bashrc"
export PATH="/usr/local/bin:$PATH"

_hack() {
sed $'s,\x1b\\[[0-9;]*[a-zA-Z],,g'
}

if [ -n "${snippet:-}" ]; then
navi alfred suggestions
navi alfred suggestions | _hack
else
navi alfred start
navi alfred start | _hack
fi
6 changes: 4 additions & 2 deletions alfred/alfred2.bash
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#!/bin/bash

source "${HOME}/.bashrc"
export PATH="/usr/local/bin:$PATH"

if [ -n "${varname:-}" ]; then
source "${HOME}/.bashrc"
echo -n "$(navi alfred transform)"
echo -n "$(navi alfred transform)" | tr -d '\n'
else
echo -n "$snippet"
fi
138 changes: 104 additions & 34 deletions alfred/info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@
<key>vitoclose</key>
<false/>
</dict>
<dict>
<key>destinationuid</key>
<string>4B245423-CD5B-4FB1-A819-4214E93BC683</string>
<key>modifiers</key>
<integer>0</integer>
<key>modifiersubtext</key>
<string></string>
<key>vitoclose</key>
<false/>
</dict>
</array>
<key>2B0EE026-57A9-4097-ACE7-FE4E78F20EC0</key>
<array>
Expand Down Expand Up @@ -96,6 +106,16 @@
<key>vitoclose</key>
<false/>
</dict>
<dict>
<key>destinationuid</key>
<string>BD60B64B-EC93-467E-AEC2-0489A3090113</string>
<key>modifiers</key>
<integer>0</integer>
<key>modifiersubtext</key>
<string></string>
<key>vitoclose</key>
<false/>
</dict>
</array>
<key>55C46852-4807-4374-95AB-CC055F4ECB7C</key>
<array>
Expand Down Expand Up @@ -414,29 +434,6 @@ fi
<key>version</key>
<integer>3</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>concurrently</key>
<false/>
<key>escaping</key>
<integer>102</integer>
<key>script</key>
<string>echo asdsds</string>
<key>scriptargtype</key>
<integer>1</integer>
<key>scriptfile</key>
<string>alfred2.bash</string>
<key>type</key>
<integer>8</integer>
</dict>
<key>type</key>
<string>alfred.workflow.action.script</string>
<key>uid</key>
<string>3CE4BEC1-BEBE-4A11-B182-E63693AE2FE6</string>
<key>version</key>
<integer>2</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand Down Expand Up @@ -488,6 +485,29 @@ fi
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>concurrently</key>
<false/>
<key>escaping</key>
<integer>102</integer>
<key>script</key>
<string>echo asdsds</string>
<key>scriptargtype</key>
<integer>1</integer>
<key>scriptfile</key>
<string>alfred2.bash</string>
<key>type</key>
<integer>8</integer>
</dict>
<key>type</key>
<string>alfred.workflow.action.script</string>
<key>uid</key>
<string>3CE4BEC1-BEBE-4A11-B182-E63693AE2FE6</string>
<key>version</key>
<integer>2</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand Down Expand Up @@ -679,6 +699,23 @@ fi
<key>version</key>
<integer>2</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>argument</key>
<string>'{query}', {allvars}</string>
<key>cleardebuggertext</key>
<false/>
<key>processoutputs</key>
<true/>
</dict>
<key>type</key>
<string>alfred.workflow.utility.debug</string>
<key>uid</key>
<string>BD60B64B-EC93-467E-AEC2-0489A3090113</string>
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
Expand All @@ -687,7 +724,9 @@ fi
<key>escaping</key>
<integer>0</integer>
<key>script</key>
<string>source $HOME/.bashrc
<string>source "${HOME}/.bashrc"
export PATH="/usr/local/bin:$PATH"
eval "$snippet"</string>
<key>scriptargtype</key>
<integer>0</integer>
Expand Down Expand Up @@ -758,6 +797,23 @@ eval "$snippet"</string>
<key>version</key>
<integer>1</integer>
</dict>
<dict>
<key>config</key>
<dict>
<key>argument</key>
<string>'{query}', {allvars}</string>
<key>cleardebuggertext</key>
<false/>
<key>processoutputs</key>
<true/>
</dict>
<key>type</key>
<string>alfred.workflow.utility.debug</string>
<key>uid</key>
<string>4B245423-CD5B-4FB1-A819-4214E93BC683</string>
<key>version</key>
<integer>1</integer>
</dict>
</array>
<key>readme</key>
<string></string>
Expand All @@ -780,9 +836,9 @@ eval "$snippet"</string>
<key>282E2B68-29A1-4EF0-B328-2BE38CBF67F0</key>
<dict>
<key>xpos</key>
<integer>1210</integer>
<integer>1185</integer>
<key>ypos</key>
<integer>270</integer>
<integer>275</integer>
</dict>
<key>2B0EE026-57A9-4097-ACE7-FE4E78F20EC0</key>
<dict>
Expand All @@ -794,9 +850,16 @@ eval "$snippet"</string>
<key>3CE4BEC1-BEBE-4A11-B182-E63693AE2FE6</key>
<dict>
<key>xpos</key>
<integer>815</integer>
<integer>820</integer>
<key>ypos</key>
<integer>165</integer>
</dict>
<key>4B245423-CD5B-4FB1-A819-4214E93BC683</key>
<dict>
<key>xpos</key>
<integer>1355</integer>
<key>ypos</key>
<integer>160</integer>
<integer>455</integer>
</dict>
<key>529BC67C-C77D-41CA-B095-996CC1317556</key>
<dict>
Expand Down Expand Up @@ -824,21 +887,21 @@ eval "$snippet"</string>
<key>xpos</key>
<integer>615</integer>
<key>ypos</key>
<integer>85</integer>
<integer>80</integer>
</dict>
<key>93437EDA-0308-467D-BE3F-6855C638D49D</key>
<dict>
<key>xpos</key>
<integer>1235</integer>
<integer>1230</integer>
<key>ypos</key>
<integer>60</integer>
</dict>
<key>98658166-32FC-4F9D-8247-52BEDE6394EE</key>
<dict>
<key>xpos</key>
<integer>980</integer>
<integer>985</integer>
<key>ypos</key>
<integer>190</integer>
<integer>195</integer>
</dict>
<key>ABA74294-992D-4528-A609-964B0ACA9346</key>
<dict>
Expand All @@ -850,7 +913,7 @@ eval "$snippet"</string>
<key>B3B967BC-EC30-47DE-B233-2F3F97568857</key>
<dict>
<key>xpos</key>
<integer>595</integer>
<integer>600</integer>
<key>ypos</key>
<integer>350</integer>
</dict>
Expand All @@ -859,7 +922,14 @@ eval "$snippet"</string>
<key>xpos</key>
<integer>1055</integer>
<key>ypos</key>
<integer>180</integer>
<integer>185</integer>
</dict>
<key>BD60B64B-EC93-467E-AEC2-0489A3090113</key>
<dict>
<key>xpos</key>
<integer>1010</integer>
<key>ypos</key>
<integer>340</integer>
</dict>
<key>E8FC4B20-3DD5-4684-97C0-FBBC2FC1AD45</key>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion shell/navi.plugin.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ __call_navi() {
local -r linecount="$(echo "$result" | wc -l)"

if [[ "$linecount" -lt 2 ]]; then
printf "$result"
printf "%s" "$result"
return 0
fi

Expand Down
2 changes: 1 addition & 1 deletion shell/navi.plugin.zsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

_call_navi() {
local selected
if selected="$(printf "$(navi --print </dev/tty)")"; then
if selected="$(printf "%s" "$(navi --print </dev/tty)")"; then
LBUFFER="$selected"
fi
zle redisplay
Expand Down

0 comments on commit 231f977

Please sign in to comment.