v1.1

Author: David Glover-Aoki

Diff for: README.md

@@ -7,7 +7,7 @@ This script needs to run on a 64-bit ARM machine. You can run it on a Raspberry
 
 ## Usage
 
-Go to the "all download options" page at raspberry.com (at the time of writing, at https://www.raspberrypi.com/software/operating-systems/), find the 64-bit "Raspberry Pi OS with desktop" image, and copy the Download URL. (You can also download the image if you prefer, but do not decompress it.)
+Go to the "all download options" page at raspberrypi.com (at the time of writing, at https://www.raspberrypi.com/software/operating-systems/), find the 64-bit "Raspberry Pi OS with desktop" image, and copy the Download URL. (You can also download the image if you prefer, but do not decompress it.)
 
 Run the script using the URL of the image, or the path of the downloaded image, as the first argument.
 
@@ -31,7 +31,7 @@ After booting your DevTerm, if the printer doesn't show up as an available devic
 sudo dpkg-reconfigure devterm-thermal-printer-cm4 devterm-thermal-printer-cups
 ```
 
-This script is not guranteed to work on versions of Raspberry Pi OS based on Debian 12. At the time of writing, these don't exist yet.
+This script is not guaranteed to work on versions of Raspberry Pi OS based on Debian 12. At the time of writing, these don't exist yet.
 
 David Glover-Aoki
 [email protected]

Diff for: changelog.txt

@@ -0,0 +1,8 @@
+1.0:
+* Initial release
+
+1.1:
+* X11 and LightDM modifications are skipped if X11 or LightDM are not found. This should allow use with the "Lite" OS image, but only in theory. In practice, the lite image doesn't have enough free space to install the extra packages. A problem for a future version.
+* Removed use of "curl" which is not always installed by default, use "wget" instead.
+* Fixed typos in readme.
+* Added changelog.txt.

Diff for: makecm4devterm

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -euo pipefail
 
-# makecm4devterm
+# makecm4devterm v1.1
 #
 # David Glover-Aoki [email protected]
 #
@@ -20,11 +20,29 @@ set -euo pipefail
 
 function processroot {
 	rootpath="$1"
+	
 	echo "Creating bind mounts"
 	mount --bind /dev "$rootpath/dev/"
 	mount --bind /sys "$rootpath/sys/"
 	mount --bind /proc "$rootpath/proc/"
 	mount --bind /dev/pts "$rootpath/dev/pts"
+	
+	echo "Installing ClockworkPi apt key"
+	wget -nv "https://raw.githubusercontent.com/clockworkpi/apt/main/debian/KEY.gpg" -O "$rootpath/etc/apt/trusted.gpg.d/clockworkpi.asc"
+	echo "Installing ClockworkPi apt repo"
+	echo "deb https://raw.githubusercontent.com/clockworkpi/apt/main/debian/ stable main" >"$rootpath/etc/apt/sources.list.d/clockworkpi.list"
+	
+	echo "Entering chroot"
+	chroot "$rootpath" /bin/bash -euo pipefail <<EOF
+		echo "Installing ClockworkPi packages"
+		DEBIAN_FRONTEND=noninteractive apt-get -qq clean
+		DEBIAN_FRONTEND=noninteractive apt-get -qq update
+		DEBIAN_FRONTEND=noninteractive apt-get -qq install devterm-thermal-printer-cm4 devterm-thermal-printer-cups devterm-fan-temp-daemon-cm4 devterm-kernel-cm4-rpi devterm-audio-patch devterm-wiringpi-cm4-cpi
+		echo "Leaving chroot"
+EOF
+	# Somehow apt starts cupsd from inside the chroot. I don't know how, this feels like a bug.
+	pgrep "cupsd" >/dev/null && killall -2 cupsd
+	
 	echo "Configuring GNOME screen rotation"
 	mkdir -p "$rootpath/etc/skel/.config"
 	cat <<EOF >"$rootpath/etc/skel/.config/monitors.xml"
@@ -60,26 +78,26 @@ EOF
 		owner_id=$(stat -c '%u' "$d")
 		chown -R $owner_id "$d/.config"
 	done
-	echo "Installing ClockworkPi apt key"
-	curl -sS "https://raw.githubusercontent.com/clockworkpi/apt/main/debian/KEY.gpg" >"$rootpath/etc/apt/trusted.gpg.d/clockworkpi.asc"
-	echo "Installing ClockworkPi apt repo"
-	echo "deb https://raw.githubusercontent.com/clockworkpi/apt/main/debian/ stable main" >"$rootpath/etc/apt/sources.list.d/clockworkpi.list"
-	echo "Configuring X11 screen rotation"
-	echo "xrandr --output DSI-1 --rotate right" >"$rootpath/etc/X11/Xsession.d/100custom_xrandr"
-	echo "Configuring LightDM screen rotation"
-	sed -i '/^#greeter-setup-script=/c\greeter-setup-script=/etc/lightdm/setup.sh' "$rootpath/etc/lightdm/lightdm.conf"
-	echo "xrandr --output DSI-1 --rotate right" >"$rootpath/etc/lightdm/setup.sh"
-	echo "exit 0" >>"$rootpath/etc/lightdm/setup.sh"
-	chmod +x "$rootpath/etc/lightdm/setup.sh"
-	echo "Entering chroot"
-	chroot "$rootpath" /bin/bash -euo pipefail <<EOF
-		echo "Installing ClockworkPi packages"
-		DEBIAN_FRONTEND=noninteractive apt-get -qq update
-		DEBIAN_FRONTEND=noninteractive apt-get -qq install devterm-thermal-printer-cm4 devterm-thermal-printer-cups devterm-fan-temp-daemon-cm4 devterm-kernel-cm4-rpi devterm-audio-patch devterm-wiringpi-cm4-cpi
-		echo "Leaving chroot"
-EOF
-	# Somehow apt starts cupsd from inside the chroot. I don't know how, this feels like a bug.
-	pgrep "cupsd" >/dev/null && killall -2 cupsd
+	
+	echo -n "Configuring X11 screen rotation: "
+	if [[ -d "$rootpath/etc/X11" ]]; then
+		echo "xrandr --output DSI-1 --rotate right" >"$rootpath/etc/X11/Xsession.d/100custom_xrandr"
+		echo "OK"
+	else
+		echo "Skipped"
+	fi
+	
+	echo -n "Configuring LightDM screen rotation: "
+	if [[ -d "$rootpath/etc/lightdm" ]]; then
+		sed -i '/^#greeter-setup-script=/c\greeter-setup-script=/etc/lightdm/setup.sh' "$rootpath/etc/lightdm/lightdm.conf"
+		echo "xrandr --output DSI-1 --rotate right" >"$rootpath/etc/lightdm/setup.sh"
+		echo "exit 0" >>"$rootpath/etc/lightdm/setup.sh"
+		chmod +x "$rootpath/etc/lightdm/setup.sh"
+		echo "OK"
+	else
+		echo "Skipped"
+	fi
+	
 	echo "Configuring console screen rotation"
 	sed -i '1s/$/ fbcon=rotate:1/' "$rootpath/boot/cmdline.txt"
 	echo "Removing bind mounts"
@@ -123,6 +141,9 @@ xz -dc "$src" >"$workdir/devterm.img"
 echo "Mounting image"
 losetup -fP "$workdir/devterm.img"
 
+# Partitions sometimes don't show up immediately, wait.
+sleep 1
+
 echo "Checking partitions on image"
 mkdir -p "$workdir/mount/boot"
 for n in {1..3}; do
@@ -154,4 +175,4 @@ rm -rf "$workdir/mount"
 rm -rf "$workdir/loop0p"*
 
 echo "Complete. Image is at:"
-echo "$workdir/devterm.img"
+echo "$workdir/devterm.img"