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
This commit is contained in:
Haitao Pan 2026-06-10 11:52:53 +08:00
parent 9ecacca0f7
commit 2184c9fa09

View File

@ -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