Skip to content

feat: make bug report URL configurable #4080

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

Closed
h8d13 wants to merge 1 commit into from
+10 −4
Closed

feat: make bug report URL configurable #4080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions archinstall/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ def run_as_a_module() -> None:
error(err)

text = (
'Archinstall experienced the above error. If you think this is a bug, please report it to\n'
'https://github.com/archlinux/archinstall and include the log file "/var/log/archinstall/install.log".\n\n'
"Hint: To extract the log from a live ISO \ncurl -F 'file=@/var/log/archinstall/install.log' https://0x0.st\n"
f'Archinstall experienced the above error. If you think this is a bug, please report it to\n'
f'{arch_config_handler.config.bug_report_url} and include the log file "/var/log/archinstall/install.log".\n\n'
f"Hint: To extract the log from a live ISO \ncurl -F 'file=@/var/log/archinstall/install.log' https://0x0.st\n"
)

warn(text)
Expand Down
5 changes: 5 additions & 0 deletions archinstall/lib/args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class ArchConfig:
timezone: str = 'UTC'
services: list[str] = field(default_factory=list)
custom_commands: list[str] = field(default_factory=list)
bug_report_url: str = 'https://github.com/archlinux/archinstall'

def unsafe_json(self) -> dict[str, Any]:
config: dict[str, list[UserSerialization] | str | None] = {}
Expand Down Expand Up @@ -108,6 +109,7 @@ def safe_json(self) -> dict[str, Any]:
'timezone': self.timezone,
'services': self.services,
'custom_commands': self.custom_commands,
'bug_report_url': self.bug_report_url,
'bootloader_config': self.bootloader_config.json() if self.bootloader_config else None,
'app_config': self.app_config.json() if self.app_config else None,
'auth_config': self.auth_config.json() if self.auth_config else None,
Expand Down Expand Up @@ -250,6 +252,9 @@ def from_config(cls, args_config: dict[str, Any], args: Arguments) -> 'ArchConfi
if custom_commands := args_config.get('custom_commands', []):
arch_config.custom_commands = custom_commands

if bug_report_url := args_config.get('bug_report_url', None):
arch_config.bug_report_url = bug_report_url

return arch_config


Expand Down
3 changes: 2 additions & 1 deletion examples/config-sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,6 @@
"algorithm": "zstd"
},
"timezone": "UTC",
"version": "2.8.6"
"version": "2.8.6",
"bug_report_url": "https://github.com/archlinux/archinstall"
}