[neon/neon/calamares-settings/Neon/release] oem-prepare/calamares/oem-prepare/prepare-user: update oem-preparare script for plasma 6

[Jonathan Riddell]

Git commit 7eda4e41ef45fb40dd132e8242b2fa8b4c985169 by Jonathan Riddell.
Committed on 19/04/2024 at 16:20.
Pushed by jriddell into branch 'Neon/release'.

update oem-preparare script for plasma 6

M  +7    -7    oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2

https://invent.kde.org/neon/neon/calamares-settings/-/commit/7eda4e41ef45fb40dd132e8242b2fa8b4c985169

diff --git a/oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2 b/oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2
index 332be0d..fb41022 100755
--- a/oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2
+++ b/oem-prepare/calamares/oem-prepare/prepare-user/calamares-oem-prepare2
@@ -37,17 +37,17 @@ cp $CALAMARES_DESKTOPFILE ~/.config/autostart
 rm -r ~/Desktop/*
 
 # Disable autolock. It makes no sense since the user wouldn't know the password.
-kwriteconfig5 --file kscreenlockerrc --group Daemon --key Autolock false
+kwriteconfig6 --file kscreenlockerrc --group Daemon --key Autolock false
 # Disable session restore so we get a semi-prestine session
-kwriteconfig5 --file ksmserverrc --group General --key loginMode default
+kwriteconfig6 --file ksmserverrc --group General --key loginMode default
 # Force all windows to center.
 # Calamares specific window rules do not work for some reason
 # so instead we simply force everything to the center (which is mostly only cala anyway)
-kwriteconfig5 --file kwinrc --group Windows --key Placement Centered
+kwriteconfig6 --file kwinrc --group Windows --key Placement Centered
 # Disable window borders. Calamares looks much nicer with the sidebar fully
 # integrating into the decoration. We can effort this effect in OEM config
 # scenarios because there aren't really any other windows necessary or visible.
-kwriteconfig5 --file kwinrc --group org.kde.kdecoration2 --key BorderSize None
+kwriteconfig6 --file kwinrc --group org.kde.kdecoration2 --key BorderSize None
 
 # Install a rule for calamares so it may not be closed via the window decoration
 # or task bar.
@@ -68,10 +68,10 @@ wmclassmatch=1
 count=1
 EOT
 
-plasmapkg2 -t Plasma/LookAndFeel -r OEM || true
-plasmapkg2 -t Plasma/LookAndFeel -i $PREPARE_DIR/oem-lnf
+kpackagetool6 -t Plasma/LookAndFeel -r OEM || true
+kpackagetool6 -t Plasma/LookAndFeel -i $PREPARE_DIR/oem-lnf
 
-qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.loadLookAndFeelDefaultLayout OEM
+/usr/lib/qt6/bin/qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.loadLookAndFeelDefaultLayout OEM
 
 sleep 8 # give plasma some time to rejigger