jessebot/dot_files
1
0
Fork 0
mirror of https://github.com/jessebot/dot_files.git synced 2025-10-01 01:48:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug of ~ not being respected

Browse source
This commit is contained in:
JesseBot 2023-06-04 14:08:27 +02:00
parent 0f01ef22c5
commit 1a3e11a90a
No known key found for this signature in database
GPG key ID: C01D207CE04D55D9
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
onboardme/env_config.py
View file

@ -8,7 +8,7 @@ import logging as log
from rich.prompt import Confirm
# custom libs
from .constants import OS, USR_CONFIG_FILE, DEFAULT_PKG_GROUPS
from .constants import OS, USR_CONFIG_FILE, DEFAULT_PKG_GROUPS, HOME_DIR
from .console_logging import print_panel
@ -98,9 +98,16 @@ def fill_in_defaults(defaults: dict, user_config: dict,
return user_config
def process_configs(overwrite: bool, repo: str, git_branch: str,
pkg_mngrs: list, pkg_groups: list, firewall: bool,
remote_host: str, steps: list, log_file: str,
def process_configs(overwrite: bool,
repo: str,
git_branch: str,
git_config_dir: str,
pkg_mngrs: list,
pkg_groups: list,
firewall: bool,
remote_host: str,
steps: list,
log_file: str,
log_level: str) -> dict:
"""
process the config in ~/.config/onboardme/config.yml if it exists,
@ -112,6 +119,8 @@ def process_configs(overwrite: bool, repo: str, git_branch: str,
if type(remote_host) is str:
remote_host = [remote_host]
if "~" in git_config_dir:
git_config_dir = git_config_dir.replace("~", HOME_DIR)
cli_dict = {'package': {'managers': {OS[0]: pkg_mngrs},
'groups': pkg_groups},
@ -120,7 +129,9 @@ def process_configs(overwrite: bool, repo: str, git_branch: str,
'firewall': firewall,
'steps': {OS[0]: steps},
'dot_files': {'overwrite': overwrite,
'git_url': repo, 'git_branch': git_branch}}
'git_url': repo,
'git_branch': git_branch,
'git_config_dir': git_config_dir}}
log.debug(f"cli_dict is:\n{cli_dict}\n")