Merge branch 'archlinux:master' into master

Author: bittin

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 default_stages: ['pre-commit']
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.11
+    rev: v0.11.13
     hooks:
         # fix unused imports and sort them
       - id: ruff
@@ -31,7 +31,7 @@ repos:
       args: [--config=.flake8]
       fail_fast: true
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.0
     hooks:
     - id: mypy
       args: [

PKGBUILD

@@ -1,15 +1,16 @@
 # Maintainer: David Runge <dvzrv@archlinux.org>
 # Maintainer: Giancarlo Razzolini <grazzolini@archlinux.org>
+# Maintainer: Anton Hvornum <torxed@archlinux.org>
 # Contributor: Anton Hvornum <anton@hvornum.se>
 # Contributor: demostanis worlds <demostanis@protonmail.com>
 
 pkgname=archinstall
-pkgver=3.0.7
+pkgver=3.0.8
 pkgrel=1
 pkgdesc="Just another guided/automated Arch Linux installer with a twist"
 arch=(any)
 url="https://github.com/archlinux/archinstall"
-license=(GPL3)
+license=(GPL-3.0-only)
 depends=(
   'arch-install-scripts'
   'btrfs-progs'
@@ -24,6 +25,7 @@ depends=(
   'pciutils'
   'procps-ng'
   'python'
+  'python-cryptography'
   'python-pydantic'
   'python-pyparted'
   'systemd'
@@ -34,13 +36,15 @@ depends=(
   'ntfs-3g'
 )
 makedepends=(
-  'python-cryptography'
-  'python-setuptools'
-  'python-sphinx'
   'python-build'
   'python-installer'
+  'python-setuptools'
+  'python-sphinx'
   'python-wheel'
   'python-sphinx_rtd_theme'
+  'python-pylint'
+  'python-pylint-pydantic'
+  'ruff'
 )
 optdepends=(
   'python-systemd: Adds journald logging'
@@ -54,19 +58,17 @@ source=(
 )
 sha512sums=()
 b2sums=()
-validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum (Torxed) <anton@hvornum.se>
+validpgpkeys=('8AA2213C8464C82D879C8127D4B58E897A929F2E') # torxed@archlinux.org
 
-pkgver() {
+check() {
   cd $pkgname-$pkgver
-
-  awk '$1 ~ /^__version__/ {gsub("\"", ""); print $3}' archinstall/__init__.py
+  ruff check
 }
 
-prepare() {
+pkgver() {
   cd $pkgname-$pkgver
 
-  # use real directories for examples and profiles, as symlinks do not work
-  rm -fv $pkgname/{examples,profiles}
+  awk '$1 ~ /^__version__/ {gsub("\"", ""); print $3}' archinstall/__init__.py
 }
 
 build() {

README.md

@@ -104,67 +104,9 @@ All available console fonts can be found in `/usr/share/kbd/consolefonts` and se
 
 ## Scripting interactive installation
 
-There are some examples in the `examples/` directory that should serve as a starting point.
+For an example of a fully scripted, interactive installation please refer to the example
+[interactive_installation.py](https://github.com/archlinux/archinstall/blob/master/archinstall/scripts/guided.py)
 
-The following is a small example of how to script your own *interactive* installation:
-
-```python
-from pathlib import Path
-
-from archinstall import Installer, ProfileConfiguration, profile_handler, User
-from archinstall.default_profiles.minimal import MinimalProfile
-from archinstall.lib.disk.device_model import FilesystemType
-from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu
-from archinstall.lib.disk.filesystem import FilesystemHandler
-from archinstall.lib.interactions.disk_conf import select_disk_config
-
-fs_type = FilesystemType('ext4')
-
-# Select a device to use for the installation
-disk_config = select_disk_config()
-
-# Optional: ask for disk encryption configuration
-data_store = {}
-disk_encryption = DiskEncryptionMenu(disk_config.device_modifications, data_store).run()
-
-# initiate file handler with the disk config and the optional disk encryption config
-fs_handler = FilesystemHandler(disk_config, disk_encryption)
-
-# perform all file operations
-# WARNING: this will potentially format the filesystem and delete all data
-fs_handler.perform_filesystem_operations()
-
-mountpoint = Path('/tmp')
-
-with Installer(
-        mountpoint,
-        disk_config,
-        disk_encryption=disk_encryption,
-        kernels=['linux']
-) as installation:
-    installation.mount_ordered_layout()
-    installation.minimal_installation(hostname='minimal-arch')
-    installation.add_additional_packages(['nano', 'wget', 'git'])
-
-    # Optionally, install a profile of choice.
-    # In this case, we install a minimal profile that is empty
-    profile_config = ProfileConfiguration(MinimalProfile())
-    profile_handler.install_profile_config(installation, profile_config)
-
-    user = User('archinstall', 'password', True)
-    installation.create_users(user)
-```
-
-This installer will perform the following actions:
-
-* Prompt the user to configure the disk partitioning
-* Prompt the user to setup disk encryption
-* Create a file handler instance for the configured disk and the optional disk encryption
-* Perform the disk operations (WARNING: this will potentially format the disks and erase all data)
-* Install a basic instance of Arch Linux *(base base-devel linux linux-firmware btrfs-progs efibootmgr)*
-* Install and configures a bootloader to partition 0 on UEFI. On BIOS, it sets the root to partition 0.
-* Install additional packages *(nano, wget, git)*
-* Create a new user
 
 > **To create your own ISO with this script in it:** Follow [ArchISO](https://wiki.archlinux.org/index.php/archiso)'s guide on creating your own ISO.
 

archinstall/__init__.py

@@ -8,6 +8,7 @@
 
 from archinstall.lib.args import arch_config_handler
 from archinstall.lib.disk.utils import disk_layouts
+from archinstall.lib.packages.packages import check_package_upgrade
 
 from .lib.hardware import SysInfo
 from .lib.output import FormattedOutput, debug, error, info, log, warn
@@ -53,15 +54,15 @@ def _check_new_version() -> None:
 	info('Checking version...')
 	upgrade = None
 
-	try:
-		upgrade = Pacman.run('-Qu archinstall').decode()
-	except Exception as e:
-		debug(f'Failed determine pacman version: {e}')
+	upgrade = check_package_upgrade('archinstall')
+
+	if upgrade is None:
+		debug('No archinstall upgrades found')
+		return None
 
-	if upgrade:
-		text = f'New version available: {upgrade}'
-		info(text)
-		time.sleep(3)
+	text = tr('New version available') + f': {upgrade}'
+	info(text)
+	time.sleep(3)
 
 
 def main() -> int:

archinstall/default_profiles/desktops/hyprland.py

@@ -66,8 +66,7 @@ def _ask_seat_access(self) -> None:
 		).run()
 
 		if result.type_ == ResultType.Selection:
-			if result.item() is not None:
-				self.custom_settings['seat_access'] = result.get_value().value
+			self.custom_settings['seat_access'] = result.get_value().value
 
 	@override
 	def do_on_select(self) -> None:

archinstall/default_profiles/desktops/labwc.py

@@ -63,8 +63,7 @@ def _ask_seat_access(self) -> None:
 		).run()
 
 		if result.type_ == ResultType.Selection:
-			if result.item() is not None:
-				self.custom_settings['seat_access'] = result.get_value().value
+			self.custom_settings['seat_access'] = result.get_value().value
 
 	@override
 	def do_on_select(self) -> None:

archinstall/default_profiles/desktops/niri.py

@@ -71,8 +71,7 @@ def _ask_seat_access(self) -> None:
 		).run()
 
 		if result.type_ == ResultType.Selection:
-			if result.item() is not None:
-				self.custom_settings['seat_access'] = result.get_value().value
+			self.custom_settings['seat_access'] = result.get_value().value
 
 	@override
 	def do_on_select(self) -> None:

archinstall/default_profiles/desktops/sway.py

@@ -73,8 +73,7 @@ def _ask_seat_access(self) -> None:
 		).run()
 
 		if result.type_ == ResultType.Selection:
-			if result.item() is not None:
-				self.custom_settings['seat_access'] = result.get_value().value
+			self.custom_settings['seat_access'] = result.get_value().value
 
 	@override
 	def do_on_select(self) -> None:

archinstall/default_profiles/desktops/xmonad.py

@@ -14,7 +14,7 @@ def packages(self) -> list[str]:
 		return [
 			'xmonad',
 			'xmonad-contrib',
-			'xmonad-extra',
+			'xmonad-extras',
 			'xterm',
 			'dmenu',
 		]

archinstall/lib/args.py

@@ -22,9 +22,8 @@
 from archinstall.lib.models.packages import Repository
 from archinstall.lib.models.profile_model import ProfileConfiguration
 from archinstall.lib.models.users import Password, User
-from archinstall.lib.output import debug, error, warn
+from archinstall.lib.output import debug, error, logger, warn
 from archinstall.lib.plugins import load_plugin
-from archinstall.lib.storage import storage
 from archinstall.lib.translationhandler import Language, tr, translation_handler
 from archinstall.lib.utils.util import get_password
 from archinstall.tui.curses_menu import Tui
@@ -389,7 +388,7 @@ def _parse_args(self) -> Arguments:
 			args.silent = False
 
 		if args.debug:
-			warn(f'Warning: --debug mode will write certain credentials to {storage["LOG_PATH"]}/{storage["LOG_FILE"]}!')
+			warn(f'Warning: --debug mode will write certain credentials to {logger.path}!')
 
 		if args.plugin:
 			plugin_path = Path(args.plugin)