[neon/neon/calamares-settings/Neon/release] /: fix some 5>6 and adapt to script needing inverted commas in calamares

[Carlos De Maine]

Git commit ff2df953a0bf7bc910d7618d907f22f424f8db5c by Carlos De Maine.
Committed on 22/04/2024 at 08:13.
Pushed by carlosdem into branch 'Neon/release'.

fix some 5>6 and adapt to script needing inverted commas in calamares

M  +1    -1    oem-config/calamares/oem-config/modules/hostnamectl.conf
M  +7    -7    oem-config/calamares/oem-config/modules/oem-undo.conf
M  +1    -1    oem-config/calamares/oem-config/modules/slimbook-proxamd5.conf
M  +1    -1    oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid-undo-and-configure.conf
M  +1    -1    oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid.conf
M  +3    -3    oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure

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

diff --git a/oem-config/calamares/oem-config/modules/hostnamectl.conf b/oem-config/calamares/oem-config/modules/hostnamectl.conf
index e5adf6e..db4a798 100644
--- a/oem-config/calamares/oem-config/modules/hostnamectl.conf
+++ b/oem-config/calamares/oem-config/modules/hostnamectl.conf
@@ -9,4 +9,4 @@
 ---
 timeout: 60
 script:
-    - sh -c 'hostnamectl set-hostname `cat /etc/hostname`'
+    - "sh -c '/usr/bin/hostnamectl set-hostname `cat /etc/hostname`'"
diff --git a/oem-config/calamares/oem-config/modules/oem-undo.conf b/oem-config/calamares/oem-config/modules/oem-undo.conf
index 1cfaf0a..8e7e1da 100644
--- a/oem-config/calamares/oem-config/modules/oem-undo.conf
+++ b/oem-config/calamares/oem-config/modules/oem-undo.conf
@@ -12,10 +12,10 @@
 ---
 timeout: 1800
 script:
-    - rm /etc/sddm.conf.d/01-calamares-oem-config.conf
-    - rm /etc/xdg/kdeglobals
-    - systemctl disable calamares-sddm.service
-    - rm /lib/systemd/system/calamares-sddm.service
-    - systemctl enable sddm.service
-    - systemctl set-default graphical.target
-    - touch /etc/calamares-oem-done
+    - "rm /etc/sddm.conf.d/01-calamares-oem-config.conf"
+    - "rm /etc/xdg/kdeglobals"
+    - "systemctl disable calamares-sddm.service"
+    - "rm /lib/systemd/system/calamares-sddm.service"
+    - "systemctl enable sddm.service"
+    - "systemctl set-default graphical.target"
+    - "touch /etc/calamares-oem-done"
diff --git a/oem-config/calamares/oem-config/modules/slimbook-proxamd5.conf b/oem-config/calamares/oem-config/modules/slimbook-proxamd5.conf
index 59cba8a..24d2449 100755
--- a/oem-config/calamares/oem-config/modules/slimbook-proxamd5.conf
+++ b/oem-config/calamares/oem-config/modules/slimbook-proxamd5.conf
@@ -3,4 +3,4 @@
 ---
 timeout: 60
 script:
-    - calamares-oem-slimbook-proxamd5
+    - "/usr/sbin/calamares-oem-slimbook-proxamd5"
diff --git a/oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid-undo-and-configure.conf b/oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid-undo-and-configure.conf
index a7986a4..0cc6acd 100644
--- a/oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid-undo-and-configure.conf
+++ b/oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid-undo-and-configure.conf
@@ -4,4 +4,4 @@
 dontChroot: true
 timeout: 16
 script:
-    - calamares-oem-uid-undo-and-configure ${ROOT}
+    - "/usr/sbin/calamares-oem-uid-undo-and-configure ${ROOT}"
diff --git a/oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid.conf b/oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid.conf
index 30e05d2..3e51df5 100644
--- a/oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid.conf
+++ b/oem-prepare/calamares/oem-prepare/modules/shellprocess_calamares-oem-uid.conf
@@ -4,4 +4,4 @@
 dontChroot: true # FIXME: for development ease, so the script runs in ISO scope not unpacked (i.e. the script can updated on the ISO)
 timeout: 16
 script:
-    - calamares-oem-uid ${ROOT}
+    - "/usr/sbin/calamares-oem-uid ${ROOT}"
diff --git a/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure b/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
index 9db191d..ac530a3 100755
--- a/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
+++ b/oem-prepare/usr/sbin/calamares-oem-uid-undo-and-configure
@@ -18,6 +18,6 @@ ln -s ../../../calamares/oem-prepare/oem-prepare.desktop $ROOT/home/oem/Desktop/
 # Make sure the oem user (900) can clean up this file!
 chown -Rv 900 $ROOT/home/oem/Desktop/
 
-kwriteconfig5 --file $ROOT/etc/sddm.conf --group Autologin --key Relogin --type bool true
-kwriteconfig5 --file $ROOT/etc/sddm.conf --group Autologin --key User oem
-kwriteconfig5 --file $ROOT/etc/sddm.conf --group Autologin --key Session plasma.desktop
+kwriteconfig6 --file $ROOT/etc/sddm.conf --group Autologin --key Relogin --type bool true
+kwriteconfig6 --file $ROOT/etc/sddm.conf --group Autologin --key User oem
+kwriteconfig6 --file $ROOT/etc/sddm.conf --group Autologin --key Session plasma.desktop