[neon/neon/calamares-settings/Neon/unstable_focal] /: updated syntax for shellprocess.conf @@ROOT@@ now ${ROOT} https://github.com/calamares/calamares/blob/3.2.x-stable/src/modules/shellprocess/shellprocess.conf is now https://github.com/calamares/calamares/blob/calamares/src/modules/shellprocess/shellprocess.conf

[Jonathan Esk-Riddell]

Git commit 49904434f5979361b68a7bad4411972f8578f656 by Jonathan Esk-Riddell.
Committed on 23/06/2022 at 10:34.
Pushed by jriddell into branch 'Neon/unstable_focal'.

updated syntax for shellprocess.conf @@ROOT@@ now ${ROOT} https://github.com/calamares/calamares/blob/3.2.x-stable/src/modules/shellprocess/shellprocess.conf is now https://github.com/calamares/calamares/blob/calamares/src/modules/shellprocess/shellprocess.conf

M  +1    -1    desktop/calamares/desktop/modules/shellprocess at boot_deploy.conf
M  +1    -1    desktop/calamares/desktop/modules/shellprocess_logs.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

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

diff --git a/desktop/calamares/desktop/modules/shellprocess at boot_deploy.conf b/desktop/calamares/desktop/modules/shellprocess at boot_deploy.conf
index ddde8a4..1d13e42 100644
--- a/desktop/calamares/desktop/modules/shellprocess at boot_deploy.conf
+++ b/desktop/calamares/desktop/modules/shellprocess at boot_deploy.conf
@@ -13,6 +13,6 @@ script:
     # This is a teeny tiny bit hacky but sufficient for 20.04+ as we don't have
     # to consider signed vs. unsinged anymore, so the below is practically
     # sufficient. Error handling is a bit on the weak side though.
-    - cp --preserve=timestamps /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-`uname -r`
+    - cp --preserve=timestamps /cdrom/casper/vmlinuz ${ROOT}/boot/vmlinuz-`uname -r`
     # We'll reconfigure the kernel in the boot_reconfigure module to ensure hooks
     # are run as needed.
diff --git a/desktop/calamares/desktop/modules/shellprocess_logs.conf b/desktop/calamares/desktop/modules/shellprocess_logs.conf
index 1869ab4..96e27d5 100644
--- a/desktop/calamares/desktop/modules/shellprocess_logs.conf
+++ b/desktop/calamares/desktop/modules/shellprocess_logs.conf
@@ -4,4 +4,4 @@
 dontChroot: true
 timeout: 30
 script:
-    - calamares-logs-helper @@ROOT@@
+    - calamares-logs-helper ${ROOT}
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 7ff5dd5..a7986a4 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@@
+    - 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 c4d3234..30e05d2 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@@
+    - calamares-oem-uid ${ROOT}