diff options
| author | Micah Lee <micah@micahflee.com> | 2018-12-21 10:46:09 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2018-12-21 10:46:09 -0800 |
| commit | 5d7449c47618e2103ef65a775386a181fcaa9e6e (patch) | |
| tree | 906b2ab5cee3c4a7214b9cbe4d9b51a3ea347855 | |
| parent | 415c01e00a46769f095b41b79eac0cf74192f38f (diff) | |
| download | onionshare-5d7449c47618e2103ef65a775386a181fcaa9e6e.tar.gz onionshare-5d7449c47618e2103ef65a775386a181fcaa9e6e.zip | |
Use os.path.expanduser when creating data dir, and no need to try creating data dir in Settings.save because it's created in Config.build_data_dir
| -rw-r--r-- | onionshare/common.py | 6 | ||||
| -rw-r--r-- | onionshare/settings.py | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/onionshare/common.py b/onionshare/common.py index d740d2ed..49c69ab5 100644 --- a/onionshare/common.py +++ b/onionshare/common.py @@ -134,11 +134,11 @@ class Common(object): except: # If for some reason we don't have the 'APPDATA' environment variable # (like running tests in Linux while pretending to be in Windows) - onionshare_data_dir = '~/.config/onionshare' + onionshare_data_dir = os.path.expanduser('~/.config/onionshare') elif self.platform == 'Darwin': - onionshare_data_dir = '~/Library/Application Support/OnionShare' + onionshare_data_dir = os.path.expanduser('~/Library/Application Support/OnionShare') else: - onionshare_data_dir = '~/.config/onionshare' + onionshare_data_dir = os.path.expanduser('~/.config/onionshare') os.makedirs(onionshare_data_dir, 0o700, True) return onionshare_data_dir diff --git a/onionshare/settings.py b/onionshare/settings.py index 38478dbd..06235198 100644 --- a/onionshare/settings.py +++ b/onionshare/settings.py @@ -185,7 +185,6 @@ class Settings(object): Save settings to file. """ self.common.log('Settings', 'save') - os.makedirs(os.path.dirname(self.filename), exist_ok=True) open(self.filename, 'w').write(json.dumps(self._settings)) self.common.log('Settings', 'save', 'Settings saved in {}'.format(self.filename)) |