From ba7d8816569954193d3291e90325fc62f1cd5905 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sun, 20 Dec 2020 15:34:41 +0100
Subject: Move browser command formatting to a new `fmtBrowserCommand()`

Not to be confused with the previous `fmtBrowserCommand()` function,
this one handles all formatting including `%s`, shell escaping, etc.
---
 browserenv.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'browserenv.go')

diff --git a/browserenv.go b/browserenv.go
index ae1024f..e83c3d1 100644
--- a/browserenv.go
+++ b/browserenv.go
@@ -77,6 +77,14 @@ func browserCommand(command, url string) *exec.Cmd {
 	shell := shellArgs[0]
 	args := shellArgs[1:]
 
+	command = fmtBrowserCommand(command, url)
+
+	args = append(args, command)
+
+	return exec.Command(shell, args...)
+}
+
+func fmtBrowserCommand(command, url string) string {
 	url = escapeURL(url)
 
 	if browserCommandIncludesURL(command) {
@@ -85,9 +93,7 @@ func browserCommand(command, url string) *exec.Cmd {
 		command = shellEscapeCommand(command, url)
 	}
 
-	args = append(args, command)
-
-	return exec.Command(shell, args...)
+	return command
 }
 
 func browserCommandIncludesURL(command string) bool {
-- 
cgit v1.2.3