From 332dcf71a446e5498f5dc97eed30678432180cf7 Mon Sep 17 00:00:00 2001
From: Aaron Rainbolt <arraybolt3@gmail.com>
Date: Mon, 6 Jun 2022 23:00:21 -0500
Subject: [PATCH] Changed contextual processes and shell processes as needed to
 support new `ROOT` placeholder syntax in Calamares 3.3.0.

---
 lubuntu/modules/after_bootloader_context.conf         | 2 +-
 lubuntu/modules/before_bootloader_mkdirs_context.conf | 8 ++++----
 lubuntu/modules/shellprocess_bug-LP#1829805.conf      | 2 +-
 lubuntu/modules/shellprocess_logs.conf                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lubuntu/modules/after_bootloader_context.conf b/lubuntu/modules/after_bootloader_context.conf
index 55a0a1b..e40d02d 100644
--- a/lubuntu/modules/after_bootloader_context.conf
+++ b/lubuntu/modules/after_bootloader_context.conf
@@ -6,4 +6,4 @@
 dontChroot: false
 timeout: 120
 firmwareType:
-    "*": "-for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/lubuntu-calamares.desktop || exit 0; done"
+    "*": "-for i in $(ls `ROOT`/home/); do rm `ROOT`/home/$i/Desktop/lubuntu-calamares.desktop || exit 0; done"
diff --git a/lubuntu/modules/before_bootloader_mkdirs_context.conf b/lubuntu/modules/before_bootloader_mkdirs_context.conf
index 871a006..5f488af 100644
--- a/lubuntu/modules/before_bootloader_mkdirs_context.conf
+++ b/lubuntu/modules/before_bootloader_mkdirs_context.conf
@@ -3,8 +3,8 @@ dontChroot: true
 timeout: 10
 firmwareType:
     efi:
-    - -cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r)
-    - -mkdir -pv @@ROOT@@/media/cdrom
-    - -mount --bind /cdrom @@ROOT@@/media/cdrom
+    - -cp /cdrom/casper/vmlinuz `ROOT`/boot/vmlinuz-$(uname -r)
+    - -mkdir -pv `ROOT`/media/cdrom
+    - -mount --bind /cdrom `ROOT`/media/cdrom
     bios:
-    - -cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r)
+    - -cp /cdrom/casper/vmlinuz `ROOT`/boot/vmlinuz-$(uname -r)
diff --git a/lubuntu/modules/shellprocess_bug-LP#1829805.conf b/lubuntu/modules/shellprocess_bug-LP#1829805.conf
index 1fbf34c..8d9bfae 100644
--- a/lubuntu/modules/shellprocess_bug-LP#1829805.conf
+++ b/lubuntu/modules/shellprocess_bug-LP#1829805.conf
@@ -2,4 +2,4 @@
 dontChroot: false
 timeout: 30
 script:
-    - "touch @@ROOT@@/boot/initrd.img-$(uname -r)"
+    - "touch `ROOT`/boot/initrd.img-$(uname -r)"
diff --git a/lubuntu/modules/shellprocess_logs.conf b/lubuntu/modules/shellprocess_logs.conf
index 0c0d54f..b3fd291 100644
--- a/lubuntu/modules/shellprocess_logs.conf
+++ b/lubuntu/modules/shellprocess_logs.conf
@@ -2,4 +2,4 @@
 dontChroot: true
 timeout: 30
 script:
-    - calamares-logs-helper @@ROOT@@
+    - calamares-logs-helper `ROOT`