From dd28ba378a8138f95c1c261972894afafa4031c3 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@users.noreply.github.com>
Date: Thu, 28 Feb 2019 12:11:52 +0100
Subject: [PATCH] node: require LocalAppData variable (#19132)
* node: require LocalAppData variable
This avoids path inconsistencies on Windows XP.
Hat tip to @MicahZoltu for catching this so quickly.
* node: fix typo
---
node/defaults.go | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/node/defaults.go b/node/defaults.go
index 73b262429..71e763346 100644
--- a/node/defaults.go
+++ b/node/defaults.go
@@ -80,13 +80,14 @@ func DefaultDataDir() string {
}
func windowsAppData() string {
- if v := os.Getenv("LOCALAPPDATA"); v != "" {
- return v // Vista+
+ v := os.Getenv("LOCALAPPDATA")
+ if v == "" {
+ // Windows XP and below don't have LocalAppData. Crash here because
+ // we don't support Windows XP and undefining the variable will cause
+ // other issues.
+ panic("environment variable LocalAppData is undefined")
}
- if v := os.Getenv("APPDATA"); v != "" {
- return filepath.Join(v, "Local")
- }
- return ""
+ return v
}
func isNonEmptyDir(dir string) bool {
--
GitLab