From 2184c9fa0972f28be219b8cd3146bfd9b12a507b Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Wed, 10 Jun 2026 11:52:53 +0800
Subject: [PATCH] fix: improve switch-desktop-mode.sh for proper config
 deployment

- Remove dest dir before copy to avoid stale config files
- Copy xworkspace-shell.service and .desktop for minimal mode
- Copy XFCE channel configs to proper xfce-perchannel-xml location
---
 scripts/switch-desktop-mode.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/switch-desktop-mode.sh b/scripts/switch-desktop-mode.sh
index accc890..3d5163c 100755
--- a/scripts/switch-desktop-mode.sh
+++ b/scripts/switch-desktop-mode.sh
@@ -33,11 +33,22 @@ echo "Setting up XWorkspace Desktop in ${MODE} mode..."
 cp -R "${ROOT_DIR}/config/systemd/." "${HOME}/.config/systemd/user/"
 
 if [[ -d "${XFCE_DIR}" ]]; then
+  rm -rf "${DEST_DIR}" && mkdir -p "${DEST_DIR}"
   cp -R "${XFCE_DIR}/." "${DEST_DIR}/"
 fi
 
 cp -R "${ROOT_DIR}/config/autostart/." "${HOME}/.config/autostart/"
 
+if [[ "${MODE}" == "minimal" || "${MODE}" == "xface-minimal" ]]; then
+  cp "${XFCE_DIR}/xworkspace-shell.service" "${HOME}/.config/systemd/user/" 2>/dev/null || true
+  cp "${XFCE_DIR}/xworkspace-shell.desktop" "${HOME}/.config/autostart/" 2>/dev/null || true
+
+  mkdir -p "${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml"
+  [[ -f "${DEST_DIR}/panel.xml" ]] && cp "${DEST_DIR}/panel.xml" "${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml"
+  [[ -f "${DEST_DIR}/xfwm4.xml" ]] && cp "${DEST_DIR}/xfwm4.xml" "${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml"
+  [[ -f "${DEST_DIR}/desktop-icons.xml" ]] && cp "${DEST_DIR}/desktop-icons.xml" "${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml"
+fi
+
 python3 - "${HOME}/.config/autostart/xworkspace-console.desktop" <<'PY'
 import sys
 from pathlib import Path