Revert "Correctly escape backslashes" (#181)

Reverts #177 Fixes #179 but reopens #131
denisidoro · Jan 22, 2020 · dbcd7ea · dbcd7ea
1 parent 4d7b58f
commit dbcd7ea
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git 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
@@ -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
diff --git 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
-}
+}
diff --git 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
-}
+}
diff --git 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)}'
-}
+}
diff --git 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)"