Release v6.0.0-alpha.12

Merge develop into master (Release v6.0.0-alpha.12)

kiauh/components/crowsnest/crowsnest.py

@@ -27,6 +27,7 @@ from components.crowsnest import (
 )
 from components.klipper.klipper import Klipper
 from core.backup_manager.backup_manager import BackupManager
+from core.constants import CURRENT_USER
 from core.logger import DialogType, Logger
 from core.settings.kiauh_settings import KiauhSettings
 from core.types.component_status import ComponentStatus
@@ -72,7 +73,7 @@ def install_crowsnest() -> None:
     Logger.print_info("Installer will prompt you for sudo password!")
     try:
         run(
-            f"sudo make install",
+            f"sudo make install BASE_USER={CURRENT_USER}",
             cwd=CROWSNEST_DIR,
             shell=True,
             check=True,

kiauh/components/webui_client/client_setup.py

@@ -144,7 +144,7 @@ def install_client(
         custom_color=Color.GREEN,
         center_content=True,
         content=[
-            f"Open {client.display_name} now on: http://{get_ipv4_addr()}{'' if port == 80 else f':{port}'}",
+            f"Open {client.display_name} now on: http://{get_ipv4_addr()}:{port}",
         ],
     )
 

kiauh/core/menus/settings_menu.py

@@ -21,7 +21,9 @@ from core.menus import Option
 from core.menus.base_menu import BaseMenu
 from core.settings.kiauh_settings import KiauhSettings, RepoSettings
 from core.types.color import Color
+from core.types.component_status import ComponentStatus
 from procedures.switch_repo import run_switch_repo_routine
+from utils.git_utils import get_repo_name
 from utils.input_utils import get_confirm, get_string_input
 
 
@@ -139,12 +141,12 @@ class SettingsMenu(BaseMenu):
 
         repo = get_string_input(
             "Enter new repository URL",
-            regex=r"^[\w/.:-]+$",
+            regex="^[\w/.:-]+$",
             default=KLIPPER_REPO_URL if repo_name == "klipper" else MOONRAKER_REPO_URL,
         )
         branch = get_string_input(
             "Enter new branch name",
-            regex=r"^.+$",
+            regex="^.+$",
             default="master"
         )
 

kiauh/procedures/system.py

@@ -51,7 +51,7 @@ def change_system_hostname() -> None:
     )
     hostname = get_string_input(
         "Enter the new hostname",
-        regex=r"^[a-z0-9]+([a-z0-9-]*[a-z0-9])?$",
+        regex="^[a-z0-9]+([a-z0-9-]*[a-z0-9])?$",
     )
     if not get_confirm(f"Change the hostname to '{hostname}'?", default_choice=False):
         Logger.print_info("Aborting hostname change ...")

scripts/crowsnest.sh

@@ -105,7 +105,7 @@ function install_crowsnest(){
   pushd "${HOME}/crowsnest" &> /dev/null || exit 1
   title_msg "Installer will prompt you for sudo password!"
   status_msg "Launching crowsnest installer ..."
-  if ! sudo make install; then
+  if ! sudo make install BASE_USER=$USER; then
     error_msg "Something went wrong! Please try again..."
     exit 1
   fi