Rename "Kde" profile to the correct "KDE Plasma" / "Plasma" (#2421)

* schema.json: Remove dead misspelled i3-gasp profile

* schema.json: Rename KDE Plasma profile to the correct "Plasma" shorthand

* Rename to KDE Plasma in user facing parts and keep the old "Kde" profile for now

* Add back an accidental deleted character

* Backwards compat v2
This commit is contained in:
Martin 2024-04-19 14:47:18 +02:00 committed by GitHub
parent f7913f46ee
commit 0ea6dbbd76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 14 additions and 11 deletions

View File

@ -15,7 +15,7 @@ class DesktopProfile(Profile):
super().__init__(
'Desktop',
ProfileType.Desktop,
description=str(_('Provides a selection of desktop environments and tiling window managers, e.g. gnome, kde, sway')),
description=str(_('Provides a selection of desktop environments and tiling window managers, e.g. GNOME, KDE Plasma, Sway')),
current_selection=current_selection,
support_greeter=True
)

View File

@ -6,10 +6,9 @@ from archinstall.default_profiles.xorg import XorgProfile
if TYPE_CHECKING:
_: Any
class KdeProfile(XorgProfile):
class PlasmaProfile(XorgProfile):
def __init__(self):
super().__init__('Kde', ProfileType.DesktopEnv, description='')
super().__init__('KDE Plasma', ProfileType.DesktopEnv, description='')
@property
def packages(self) -> List[str]:

View File

@ -20,7 +20,7 @@ class NicType(Enum):
case NicType.ISO:
return str(_('Copy ISO network configuration to installation'))
case NicType.NM:
return str(_('Use NetworkManager (necessary to configure internet graphically in GNOME and KDE)'))
return str(_('Use NetworkManager (necessary to configure internet graphically in GNOME and KDE Plasma)'))
case NicType.MANUAL:
return str(_('Manual configuration'))

View File

@ -107,6 +107,11 @@ class ProfileHandler:
if details:
for detail in filter(None, details):
# [2024-04-19] TODO: Backwards compatibility after naming change: https://github.com/archlinux/archinstall/pull/2421
# 'Kde' is deprecated, remove this block in a future version
if detail == 'Kde':
detail = 'KDE Plasma'
if sub_profile := self.get_profile_by_name(detail):
valid_sub_profiles.append(sub_profile)
else:

View File

@ -106,7 +106,7 @@
"greeter": "sddm",
"profile": {
"details": [
"Kde"
"KDE Plasma"
],
"main": "Desktop"
}

View File

@ -66,10 +66,10 @@ exclude = (?x)(
| ^archinstall/profiles/enlightenment\.py$
| ^archinstall/profiles/gnome\.py$
| ^archinstall/profiles/i3\.py$
| ^archinstall/profiles/kde\.py$
| ^archinstall/profiles/lxqt\.py$
| ^archinstall/profiles/mate\.py$
| ^archinstall/profiles/minimal\.py$
| ^archinstall/profiles/plasma\.py$
| ^archinstall/profiles/qtile\.py$
| ^archinstall/profiles/server\.py$
| ^archinstall/profiles/sway\.py$
@ -86,10 +86,10 @@ exclude = (?x)(
| ^profiles/enlightenment\.py$
| ^profiles/gnome\.py$
| ^profiles/i3\.py$
| ^profiles/kde\.py$
| ^profiles/lxqt\.py$
| ^profiles/mate\.py$
| ^profiles/minimal\.py$
| ^profiles/plasma\.py$
| ^profiles/qtile\.py$
| ^profiles/server\.py$
| ^profiles/sway\.py$

View File

@ -129,7 +129,7 @@
]
},
"details": {
"description": "Specific profile to be installed based on the 'main' selection; these profiles are present in profiles_v2/, use the name of a profile to install it (case insensitive)",
"description": "Specific profile to be installed based on the 'main' selection; these profiles are present in default_profiles/, use the file name of a profile without the extension to install it (case insensitive)",
"type": "string",
"enum": [
"awesome",
@ -142,8 +142,7 @@
"enlightenment",
"gnome",
"i3-wm",
"i3-gasp",
"kde",
"plasma",
"lxqt",
"mate",
"sway",