mirror of
https://github.com/cheat/cheat.git
synced 2024-11-22 05:51:35 +01:00
Merge pull request #435 from roachsinai/master
Expand ~ for 'CHEAT_USER_DIR', 'CHEAT_DEFAULT_DIR' and 'DEFAULT_CHEAT…
This commit is contained in:
commit
ec360ccddd
@ -49,15 +49,14 @@ class Configuration:
|
||||
]).strip().lower()
|
||||
|
||||
# self.cheat_user_dir
|
||||
self.cheat_user_dir = self._select([
|
||||
os.environ.get('CHEAT_USER_DIR'),
|
||||
os.environ.get('CHEAT_DEFAULT_DIR'),
|
||||
os.environ.get('DEFAULT_CHEAT_DIR'),
|
||||
# TODO: XDG home?
|
||||
os.path.expanduser(
|
||||
os.path.expandvars(os.path.join('~', '.cheat'))
|
||||
),
|
||||
])
|
||||
self.cheat_user_dir = self._select(
|
||||
map(os.path.expanduser,
|
||||
filter(None,
|
||||
[os.environ.get('CHEAT_USER_DIR'),
|
||||
os.environ.get('CHEAT_DEFAULT_DIR'),
|
||||
os.environ.get('DEFAULT_CHEAT_DIR'),
|
||||
# TODO: XDG home?
|
||||
os.path.join('~', '.cheat')])))
|
||||
|
||||
# self.cheat_editor
|
||||
self.cheat_editor = self._select([
|
||||
|
Loading…
Reference in New Issue
Block a user