From 5d7449c47618e2103ef65a775386a181fcaa9e6e Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Fri, 21 Dec 2018 10:46:09 -0800 Subject: 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 --- onionshare/common.py | 6 +++--- 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)) -- cgit v1.2.3-54-g00ecf