diff options
| author | Chris Waldon <christopher.waldon.dev@gmail.com> | 2020-11-29 23:58:29 +0000 |
|---|---|---|
| committer | Cherry Zhang <cherryyz@google.com> | 2020-11-30 17:45:06 +0000 |
| commit | c193279e2c9e62e8ddc0893484251b4411461d62 (patch) | |
| tree | b81cca863c3c05882ce2427ffd4b443a307f703f /src/os | |
| parent | 294c214ccac877be8d8ce16b0302434a15a2476b (diff) | |
| download | go-c193279e2c9e62e8ddc0893484251b4411461d62.tar.gz go-c193279e2c9e62e8ddc0893484251b4411461d62.zip | |
os: return proper user directories on iOS
Separating iOS into its own runtime constant broke the logic
here to derive the correct home, cache, and config directories
on iOS devices.
Fixes #42878
Change-Id: Ie4ff57895fcc34b0a9af45554ea3a346447d2e7a
GitHub-Last-Rev: 5e74e64917fa46e9c6e0d963cab5194ab89e2f64
GitHub-Pull-Request: golang/go#42879
Reviewed-on: https://go-review.googlesource.com/c/go/+/273947
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/file.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/os/file.go b/src/os/file.go index 835d44ab8c..420e62ef2c 100644 --- a/src/os/file.go +++ b/src/os/file.go @@ -406,7 +406,7 @@ func UserCacheDir() (string, error) { return "", errors.New("%LocalAppData% is not defined") } - case "darwin": + case "darwin", "ios": dir = Getenv("HOME") if dir == "" { return "", errors.New("$HOME is not defined") @@ -457,7 +457,7 @@ func UserConfigDir() (string, error) { return "", errors.New("%AppData% is not defined") } - case "darwin": + case "darwin", "ios": dir = Getenv("HOME") if dir == "" { return "", errors.New("$HOME is not defined") @@ -505,10 +505,8 @@ func UserHomeDir() (string, error) { switch runtime.GOOS { case "android": return "/sdcard", nil - case "darwin": - if runtime.GOARCH == "arm64" { - return "/", nil - } + case "ios": + return "/", nil } return "", errors.New(enverr + " is not defined") } |