From 677483a5026a1c175f70b4c22d28a112d83ff484 Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 25 May 2026 18:44:01 -0600 Subject: [PATCH] Using existing repo .desktop files instead of hand-rolled variants. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Earlier commit hand-rolled six Type=Link launchers from scratch. The repo already had the canonical files at etc/raspberrypios/wrolpi.desktop, wrolpi-help.desktop, wrolpi-help-files.desktop, and controller.desktop, used on the RPi/Debian bare-metal deployments. Switching the chroot hook to `cp` those files into ~/Desktop/ keeps the live ISO in sync with the other deployments — when those .desktop files get edited (URL changes, new icon, etc.), the live ISO inherits the change with no chroot-hook edit needed. Drops the Kiwix Library, WROLPi Files, and Disk Management entries the previous commit added; the user requested the four canonical entries only. The trust autostart from the previous commit continues to mark all *.desktop in ~/Desktop, so the surviving icons launch on double-click. All four icons tested on the live ISO at 10.0.0.17: WROLPi App https://127.0.0.1 ✓ WROLPi Controller http://127.0.0.1 ✓ WROLPi Help http://127.0.0.1:9086 ✓ WROLPi Help Files file:///opt/wrolpi-help/docs ✓ Co-Authored-By: Claude Opus 4.7 (1M context) --- .../hooks/normal/9999-wrolpi.hook.chroot | 63 +++---------------- 1 file changed, 10 insertions(+), 53 deletions(-) diff --git a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot index 15c7cae9..0833bae0 100644 --- a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot +++ b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot @@ -208,60 +208,17 @@ EOF mkdir -p /home/wrolpi/Desktop -# Desktop shortcuts to WROLPi's HTTPS services and the on-drive media -# directory. Type=Link entries dispatch via xdg-open, which sidesteps -# XFCE's executable-launcher trust check (the check only applies to -# Type=Application entries with an Exec field). All URLs go through -# Caddy on localhost, configured in /etc/caddy/Caddyfile. -cat > /home/wrolpi/Desktop/wrolpi-app.desktop <<'EOF' -[Desktop Entry] -Encoding=UTF-8 -Name=WROLPi -Type=Link -URL=https://localhost/ -Icon=/opt/wrolpi/icon.png -EOF -cat > /home/wrolpi/Desktop/wrolpi-controller.desktop <<'EOF' -[Desktop Entry] -Encoding=UTF-8 -Name=WROLPi Controller -Type=Link -URL=https://localhost/controller/ -Icon=/opt/wrolpi/etc/raspberrypios/controller-logo.png -EOF -cat > /home/wrolpi/Desktop/wrolpi-help.desktop <<'EOF' -[Desktop Entry] -Encoding=UTF-8 -Name=WROLPi Help -Type=Link -URL=https://localhost:8086/ -Icon=help-browser -EOF -cat > /home/wrolpi/Desktop/wrolpi-help-files.desktop <<'EOF' -[Desktop Entry] -Encoding=UTF-8 -Name=WROLPi Help Files -Type=Link -URL=file:///opt/wrolpi-help/docs/ -Icon=folder-documents -EOF -cat > /home/wrolpi/Desktop/wrolpi-kiwix.desktop <<'EOF' -[Desktop Entry] -Encoding=UTF-8 -Name=Kiwix Library -Type=Link -URL=https://localhost:8085/ -Icon=accessories-dictionary -EOF -cat > /home/wrolpi/Desktop/wrolpi-files.desktop <<'EOF' -[Desktop Entry] -Encoding=UTF-8 -Name=WROLPi Files -Type=Link -URL=file:///media/wrolpi/ -Icon=folder -EOF +# Desktop shortcuts to WROLPi's services. Use the canonical .desktop +# files from the repo (etc/raspberrypios/) so updates to those files +# propagate to the live ISO without touching the chroot hook. +# wrolpi-trust-desktop-icons.desktop autostart marks each as trusted at +# session start so XFCE will launch them on double-click. +cp /opt/wrolpi/etc/raspberrypios/wrolpi.desktop /home/wrolpi/Desktop/ +cp /opt/wrolpi/etc/raspberrypios/controller.desktop /home/wrolpi/Desktop/ +cp /opt/wrolpi/etc/raspberrypios/wrolpi-help.desktop /home/wrolpi/Desktop/ +cp /opt/wrolpi/etc/raspberrypios/wrolpi-help-files.desktop /home/wrolpi/Desktop/ +chmod +x /home/wrolpi/Desktop/*.desktop chown -R wrolpi:wrolpi /home/wrolpi/Desktop # Drop the default Postgres cluster created by the postgresql-* package.