mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-02-22 06:41:44 +01:00
reckless: it turns out the warning is a bit much.
The user should be informed that their config now has a new source, but but any config files created downstream should be automatically populated.
This commit is contained in:
parent
b1b280d10b
commit
7e8a889d89
1 changed files with 11 additions and 7 deletions
|
@ -105,7 +105,7 @@ def remove_dir(target):
|
||||||
|
|
||||||
class Config():
|
class Config():
|
||||||
"""A generic class for procuring, reading and editing config files"""
|
"""A generic class for procuring, reading and editing config files"""
|
||||||
def obtain_config(self, config_path, default_text):
|
def obtain_config(self, config_path, default_text, warn=False):
|
||||||
"""Return a config file from the desired location. Create one with
|
"""Return a config file from the desired location. Create one with
|
||||||
default_text if it cannot be found."""
|
default_text if it cannot be found."""
|
||||||
if isinstance(config_path, type(None)):
|
if isinstance(config_path, type(None)):
|
||||||
|
@ -117,8 +117,11 @@ class Config():
|
||||||
config_content = f.readlines()
|
config_content = f.readlines()
|
||||||
return config_content
|
return config_content
|
||||||
print(f'config file not found: {config_path}')
|
print(f'config file not found: {config_path}')
|
||||||
confirm = input('press [Y] to create one now.\n')
|
if warn:
|
||||||
if confirm.upper() != 'Y':
|
confirm = input('press [Y] to create one now.\n').upper() == 'Y'
|
||||||
|
else:
|
||||||
|
confirm = True
|
||||||
|
if not confirm:
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
parent_path = os.path.split(config_path)[0]
|
parent_path = os.path.split(config_path)[0]
|
||||||
# Create up to one parent in the directory tree.
|
# Create up to one parent in the directory tree.
|
||||||
|
@ -161,11 +164,12 @@ class Config():
|
||||||
if not line_exists:
|
if not line_exists:
|
||||||
conf_write.write(f'\n{addline}')
|
conf_write.write(f'\n{addline}')
|
||||||
|
|
||||||
def __init__(self, path=None, default_text=None):
|
def __init__(self, path=None, default_text=None, warn=False):
|
||||||
assert path is not None
|
assert path is not None
|
||||||
assert default_text is not None
|
assert default_text is not None
|
||||||
self.conf_fp = path
|
self.conf_fp = path
|
||||||
self.content = self.obtain_config(self.conf_fp, default_text)
|
self.content = self.obtain_config(self.conf_fp, default_text,
|
||||||
|
warn=warn)
|
||||||
|
|
||||||
|
|
||||||
class RecklessConfig(Config):
|
class RecklessConfig(Config):
|
||||||
|
@ -199,13 +203,13 @@ class LightningBitcoinConfig(Config):
|
||||||
"""lightningd config specific to the bitcoin network. This is inherited by
|
"""lightningd config specific to the bitcoin network. This is inherited by
|
||||||
the main lightningd config and in turn, inherits bitcoin-reckless.conf."""
|
the main lightningd config and in turn, inherits bitcoin-reckless.conf."""
|
||||||
|
|
||||||
def __init__(self, path=None, default_text=None):
|
def __init__(self, path=None, default_text=None, warn=True):
|
||||||
if path is None:
|
if path is None:
|
||||||
path = os.path.join(LIGHTNING_DIR, 'bitcoin', 'config')
|
path = os.path.join(LIGHTNING_DIR, 'bitcoin', 'config')
|
||||||
if default_text is None:
|
if default_text is None:
|
||||||
default_text = "# This config was autopopulated by reckless\n\n"
|
default_text = "# This config was autopopulated by reckless\n\n"
|
||||||
Config.__init__(self, path=str(path),
|
Config.__init__(self, path=str(path),
|
||||||
default_text=default_text)
|
default_text=default_text, warn=warn)
|
||||||
|
|
||||||
|
|
||||||
class InferInstall():
|
class InferInstall():
|
||||||
|
|
Loading…
Add table
Reference in a new issue