Widget: fix behavior for % (#368)v2.7.1

8 files changed, 122 insertions, 43 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 25cbfc9..8642910 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -174,7 +174,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "navi"
-version = "2.7.0"
+version = "2.7.1"
 dependencies = [
  "anyhow 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 56211cf..2c51316 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "navi"
-version = "2.7.0"
+version = "2.7.1"
 authors = ["Denis Isidoro <denis_isidoro@live.com>"]
 edition = "2018"
 description = "An interactive cheatsheet tool for the command-line"
diff --git a/alfred/alfred0.bash b/alfred/alfred0.bash
index 0945ffc..7976690 100755
--- a/alfred/alfred0.bash
+++ b/alfred/alfred0.bash
@@ -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"
diff --git a/alfred/alfred1.bash b/alfred/alfred1.bash
index 7ab181f..a1424a3 100755
--- a/alfred/alfred1.bash
+++ b/alfred/alfred1.bash
@@ -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
diff --git a/alfred/alfred2.bash b/alfred/alfred2.bash
index dee4398..d067437 100755
--- a/alfred/alfred2.bash
+++ b/alfred/alfred2.bash
@@ -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
diff --git a/alfred/info.plist b/alfred/info.plist
index 10c1843..abfb25c 100644
--- a/alfred/info.plist
+++ b/alfred/info.plist
@@ -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>
@@ -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>
@@ -426,29 +446,6 @@ fi
 				<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>
-				<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>alfred0.bash</string>
 				<key>type</key>
 				<integer>8</integer>
@@ -491,6 +488,29 @@ fi
 		<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>
 				<key>conditions</key>
 				<array>
 					<dict>
@@ -682,12 +702,31 @@ fi
 		<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>
 				<key>concurrently</key>
 				<true/>
 				<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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/shell/navi.plugin.bash b/shell/navi.plugin.bash
index 342d924..6b44ed1 100644
--- a/shell/navi.plugin.bash
+++ b/shell/navi.plugin.bash
@@ -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
 
diff --git a/shell/navi.plugin.zsh b/shell/navi.plugin.zsh
index 0ad3546..ef2d327 100644
--- a/shell/navi.plugin.zsh
+++ b/shell/navi.plugin.zsh
@@ -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