summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Isidoro <denisidoro@users.noreply.github.com>2020-01-22 17:26:25 -0300
committerGitHub <noreply@github.com>2020-01-22 17:26:25 -0300
commitdbcd7eae4a7bb175d5831d4846d8781d05eaa5dd (patch)
tree83cec6738d4496c2d58e8655a546633d7989504e
parent4d7b58fa1800b24548304c47a56e7726958595a7 (diff)
Revert "Correctly escape backslashes" (#181)v0.18.2
Reverts #177 Fixes #179 but reopens #131
-rwxr-xr-xnavi2
-rw-r--r--src/arg.sh2
-rwxr-xr-x[-rw-r--r--]src/cheat.sh0
-rw-r--r--src/cmd.sh6
-rw-r--r--src/selection.sh4
-rw-r--r--src/str.sh3
-rw-r--r--src/ui.sh2
7 files changed, 8 insertions, 11 deletions
diff --git a/navi b/navi
index a3face8..ab5a346 100755
--- a/navi
+++ b/navi
@@ -4,7 +4,7 @@ set -euo pipefail
export NAVI_HOME="$(cd "$(dirname "$0")" && pwd)"
source "${NAVI_HOME}/src/main.sh"
-VERSION="0.18.1"
+VERSION="0.18.2"
NAVI_ENV="${NAVI_ENV:-prod}"
opts::eval "$@"
diff --git a/src/arg.sh b/src/arg.sh
index 0897673..6fd2afc 100644
--- a/src/arg.sh
+++ b/src/arg.sh
@@ -67,8 +67,6 @@ arg::serialize_code() {
printf "tr \"'\" '${ESCAPE_CHAR_2}'"
printf " | "
printf "tr '\"' '${ESCAPE_CHAR_3}'"
- printf " | "
- printf "tr '\\\\' '${ESCAPE_CHAR_4}'"
}
arg::pick() {
diff --git a/src/cheat.sh b/src/cheat.sh
index 84bf6ea..84bf6ea 100644..100755
--- a/src/cheat.sh
+++ b/src/cheat.sh
diff --git a/src/cmd.sh b/src/cmd.sh
index f52e48f..f0bdd8e 100644
--- a/src/cmd.sh
+++ b/src/cmd.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
cmd::escape() {
- tr '\\' "$ESCAPE_CHAR_4"
+ tr '\\' "$ESCAPE_CHAR_3"
}
cmd::unescape() {
- tr "$ESCAPE_CHAR_4" '\\'
+ tr "$ESCAPE_CHAR_3" '\\'
}
cmd::loop() {
@@ -50,4 +50,4 @@ cmd::finish() {
else
eval "$cmd"
fi
-}
+} \ No newline at end of file
diff --git a/src/selection.sh b/src/selection.sh
index c39b742..06cde84 100644
--- a/src/selection.sh
+++ b/src/selection.sh
@@ -15,7 +15,7 @@ selection_str::comment() {
}
selection_str::snippet() {
- echo "$*" | awk -F "${SELECTION_ESCAPE_STR}" '{print $2}' | selection_str::without_ellipsis | cmd::escape
+ echo "$*" | awk -F "${SELECTION_ESCAPE_STR}" '{print $2}' | selection_str::without_ellipsis
}
selection_str::tags() {
@@ -72,4 +72,4 @@ selection::tags() {
selection::key() {
local -r selection="$1"
dict::get "$selection" key
-}
+} \ No newline at end of file
diff --git a/src/str.sh b/src/str.sh
index 0f26489..55ed101 100644
--- a/src/str.sh
+++ b/src/str.sh
@@ -3,7 +3,6 @@
ESCAPE_CHAR="\034"
ESCAPE_CHAR_2="\035"
ESCAPE_CHAR_3="\036"
-ESCAPE_CHAR_4="\037"
str::length() {
awk '{print length}'
@@ -83,4 +82,4 @@ str::as_column() {
str::with_line_numbers() {
awk '{printf("%d %s\n", NR,$0)}'
-}
+} \ No newline at end of file
diff --git a/src/ui.sh b/src/ui.sh
index 1395383..6716c75 100644
--- a/src/ui.sh
+++ b/src/ui.sh
@@ -23,7 +23,7 @@ ui::select() {
[[ "${SHELL:-}" =~ 'fish' ]] || local -r sub='$'
local -r script_path="${NAVI_HOME}/navi"
- local -r preview_cmd="\"${script_path}\" preview ${sub:-}(echo \'{}\' | $(arg::serialize_code) 2> /dev/null)"
+ local -r preview_cmd="\"${script_path}\" preview ${sub:-}(echo \'{}\' | $(arg::serialize_code))"
local -r query="$(dict::get "$OPTIONS" query)"
local -r entry_point="$(dict::get "$OPTIONS" entry_point)"