Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config: don't assume ~/.sopel as dotdir #1404

Merged
merged 2 commits into from
Feb 7, 2019
Merged

config: don't assume ~/.sopel as dotdir #1404

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f8e6b0
config: don't assume ~/.sopel as dotdir
dgw May 9, 2018
9b69f07
config: replace hardcoded defaults with DEFAULT_HOMEDIR
dgw Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions sopel/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,12 @@ def _modules(self):


def _wizard(section, config=None):
dotdir = os.path.expanduser('~/.sopel')
dotdir = os.path.dirname(config) if config is not None else DEFAULT_HOMEDIR
configpath = os.path.join(dotdir, ((config or 'default.cfg') + ('.cfg' if config and not config.endswith('.cfg') else '')))
if section == 'all':
_create_config(configpath)
elif section == 'mod':
_check_dir(False)
_check_dir(dotdir, False)
if not os.path.isfile(configpath):
print("No config file found." +
" Please make one before configuring these options.")
Expand All @@ -228,15 +228,14 @@ def _wizard(section, config=None):
config._modules()


def _check_dir(create=True):
dotdir = os.path.join(os.path.expanduser('~'), '.sopel')
if not os.path.isdir(dotdir):
def _check_dir(path=DEFAULT_HOMEDIR, create=True):
if not os.path.isdir(path):
if create:
print('Creating a config directory at ~/.sopel...')
print('Creating a config directory at {}...'.format(path))
try:
os.makedirs(dotdir)
os.makedirs(path)
except Exception as e:
print('There was a problem creating %s:' % dotdir, file=sys.stderr)
print('There was a problem creating %s:' % path, file=sys.stderr)
print('%s, %s' % (e.__class__, str(e)), file=sys.stderr)
print('Please fix this and then run Sopel again.', file=sys.stderr)
sys.exit(1)
Expand All @@ -246,7 +245,7 @@ def _check_dir(create=True):


def _create_config(configpath):
_check_dir()
_check_dir(os.path.dirname(configpath))
print("Please answer the following questions" +
" to create your configuration file:\n")
try:
Expand Down