From 13428ca13e26052afdaed076333dc0b6918b213f Mon Sep 17 00:00:00 2001
From: Ryan Kuba <ryankuba@gmail.com>
Date: Mon, 22 Apr 2024 12:11:58 -0700
Subject: [PATCH] Noble xfce (#237)

* rebase xfce to noble

* xfce tweaks
---
 Dockerfile               |  4 +++-
 Dockerfile.aarch64       |  4 +++-
 root/defaults/startwm.sh | 15 +++++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7a427f93..5b7cbe97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntujammy
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -34,6 +34,8 @@ RUN \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
+    /config/.cache \
+    /config/.launchpadlib \
     /var/lib/apt/lists/* \
     /var/tmp/* \
     /tmp/*
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 38acda8a..82b4d354 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-ubuntujammy
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -34,6 +34,8 @@ RUN \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
+    /config/.cache \
+    /config/.launchpadlib \
     /var/lib/apt/lists/* \
     /var/tmp/* \
     /tmp/*
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index b5612da4..ba03ff3c 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -2,9 +2,16 @@
 
 setterm blank 0
 setterm powerdown 0
-if [ -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
-  sed -i \
-    '/use_compositing/c <property name="use_compositing" type="bool" value="false"/>' \
-    "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+if [ ! -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
+  mkdir -p "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/
+cat <<EOT >> "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<channel name="xfwm4" version="1.0">
+  <property name="general" type="empty">
+    <property name="use_compositing" type="bool" value="false"/>
+  </property>
+</channel>
+EOT
 fi
+
 /usr/bin/xfce4-session > /dev/null 2>&1