Normalize Windows paths

browserpass · Mar 30, 2019 · 8411954 · 8411954
1 parent 2c4bd1d
commit 8411954
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ The Makefile currently does not support Windows, so instead of `sudo make instal
 
 First, copy the contents of the extracted `browserpass-windows64` folder to a permanent location where you want Browserpass to be installed, for the sake of example let's suppose it is `C:\Program Files\Browserpass\`.
 
-Then edit the hosts json files (in our example `C:\Program Files\Browserpass\browser-files\*-host.json`) and replace `%%replace%%` with a full path to `browserpass-windows64.exe` (in our example `C:\Program Files\Browserpass\browserpass-windows64.exe`).
+Then edit the hosts json files (in our example `C:\Program Files\Browserpass\browser-files\*-host.json`) and replace `%%replace%%` with a full path to `browserpass-windows64.exe` (in our example `C:\\Program Files\\Browserpass\\browserpass-windows64.exe`).
 
 Finally proceed to the [Configure browsers on Windows](#configure-browsers-on-windows) section.
 

diff --git a/request/list.go b/request/list.go
@@ -3,6 +3,7 @@ package request
 import (
 	"path/filepath"
 	"sort"
+	"strings"
 
 	"github.com/browserpass/browserpass-native/errors"
 	"github.com/browserpass/browserpass-native/response"
@@ -74,7 +75,7 @@ func listFiles(request *request) {
 					},
 				)
 			}
-			files[i] = relativePath
+			files[i] = strings.Replace(relativePath, "\\", "/", -1) // normalize Windows paths
 		}
 
 		sort.Strings(files)