From a6431a8a0db0a6bbb2aa6eb1cfa4392f14d7701b Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Wed, 17 Jan 2024 13:43:23 -0800
Subject: [PATCH] sync webtop changes

---
 Dockerfile                          |  2 +-
 Dockerfile.aarch64                  |  2 +-
 root/defaults/startwm.sh            | 11 +++++++++++
 root/usr/local/bin/wrapped-chromium |  7 ++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bd7861ae..5575ec69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-38
+FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-39
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index bd22a05a..7fc9dbfc 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-38
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-39
 
 # set version label
 ARG BUILD_DATE
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index 642bd0ed..b0c64b90 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,3 +1,14 @@
 #!/bin/bash
 /startpulse.sh &
+if [ ! -f $HOME/.config/kwinrc ]; then
+  kwriteconfig5 --file $HOME/.config/kwinrc --group Compositing --key Enabled false
+fi
+if [ ! -f $HOME/.config/kscreenlockerrc ]; then
+  kwriteconfig5 --file $HOME/.config/kscreenlockerrc --group Daemon --key Autolock false
+fi
+if [ ! -f $HOME/.config/kdeglobals ]; then
+  kwriteconfig5 --file $HOME/.config/kdeglobals --group KDE --key LookAndFeelPackage org.fedoraproject.fedora.desktop
+fi
+setterm blank 0
+setterm powerdown 0
 /usr/bin/startplasma-x11 > /dev/null 2>&1
diff --git a/root/usr/local/bin/wrapped-chromium b/root/usr/local/bin/wrapped-chromium
index 58b953c0..02a5e6b9 100755
--- a/root/usr/local/bin/wrapped-chromium
+++ b/root/usr/local/bin/wrapped-chromium
@@ -2,8 +2,13 @@
 
 BIN=/usr/bin/chromium-browser
 
+# Cleanup
+if ! pgrep chromium > /dev/null;then
+  rm -f $HOME/.config/chromium/Singleton*
+fi
+
 # Run normally on privved containers or modified un non priv
-if grep -q 'Seccomp:	0' /proc/1/status; then
+if grep -q 'Seccomp:\t0' /proc/1/status; then
   ${BIN} --password-store=basic "$@"
 else
   ${BIN} --password-store=basic --no-sandbox --test-type "$@"