mirror of
https://github.com/onionshare/onionshare.git
synced 2024-12-31 18:26:12 -05:00
Build downloads_dir a different way in macOS, so it's correct despite the sandbox
This commit is contained in:
parent
250dbf9199
commit
33bd7b4a80
@ -22,6 +22,7 @@ import json
|
|||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
import locale
|
import locale
|
||||||
|
import pwd
|
||||||
|
|
||||||
from . import strings
|
from . import strings
|
||||||
|
|
||||||
@ -128,7 +129,13 @@ class Settings(object):
|
|||||||
"""
|
"""
|
||||||
# TODO: Test in Windows, though it looks like it should work
|
# TODO: Test in Windows, though it looks like it should work
|
||||||
# https://docs.python.org/3/library/os.path.html#os.path.expanduser
|
# https://docs.python.org/3/library/os.path.html#os.path.expanduser
|
||||||
return os.path.expanduser('~/OnionShare')
|
if self.common.platform == "Darwin":
|
||||||
|
# We can't use os.path.expanduser in macOS because in the sandbox it
|
||||||
|
# returns the path to the sandboxed homedir
|
||||||
|
real_homedir = pwd.getpwuid(os.getuid()).pw_dir
|
||||||
|
return os.path.join(real_homedir, 'OnionShare')
|
||||||
|
else:
|
||||||
|
return os.path.expanduser('~/OnionShare')
|
||||||
|
|
||||||
def load(self):
|
def load(self):
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user