Fixed an issue where backticks were not properly escaped

justjanne · Aug 22, 2017 · 2b4299d · 2b4299d
1 parent adb0696
commit 2b4299d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/defaults.go b/defaults.go
@@ -21,27 +21,29 @@ var symbolTemplates = map[string]Symbols{
 		RepoUntracked:  "+",
 		RepoConflicted: "\u273C",
 	},
-	"flat": {
-	},
+	"flat": {},
 }
 
 var shellInfos = map[string]ShellInfo{
 	"bash": {
 		colorTemplate:    "\\[\\e%s\\]",
 		rootIndicator:    " \\$ ",
 		escapedBackslash: `\\\\`,
+		escapedBacktick:  "\\`",
 		escapedDollar:    `\$`,
 	},
 	"zsh": {
 		colorTemplate:    "%%{\u001b%s%%}",
 		rootIndicator:    " %# ",
 		escapedBackslash: `\\`,
+		escapedBacktick:  "\\`",
 		escapedDollar:    `\$`,
 	},
 	"bare": {
-		colorTemplate:    "%s",
+		colorTemplate: "%s",
 		rootIndicator:    " $ ",
 		escapedBackslash: `\`,
+		escapedBacktick:  "`",
 		escapedDollar:    `$`,
 	},
 }

diff --git a/powerline.go b/powerline.go
@@ -10,6 +10,7 @@ type ShellInfo struct {
 	rootIndicator    string
 	colorTemplate    string
 	escapedDollar    string
+	escapedBacktick  string
 	escapedBackslash string
 }
 

diff --git a/segment-cwd.go b/segment-cwd.go
@@ -57,6 +57,7 @@ func maybeShortenName(p *powerline, pathSegment string) string {
 
 func escapeVariables(p *powerline, pathSegment string) string {
 	pathSegment = strings.Replace(pathSegment, `\`, p.shellInfo.escapedBackslash, -1)
+	pathSegment = strings.Replace(pathSegment, "`", p.shellInfo.escapedBacktick, -1)
 	pathSegment = strings.Replace(pathSegment, `$`, p.shellInfo.escapedDollar, -1)
 	return pathSegment
 }