From 44bb2ade9654515c3764d2a26e699cb54475a573 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Mon, 24 May 2021 17:27:37 +0200
Subject: [PATCH] xfce4: improved package()

---
 pkg/de-p1st-xfce4/PKGBUILD                       | 16 ++++++++--------
 .../xfconf/xfce-perchannel-xml/xfce4-panel.xml   |  4 +++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD
index a3bd8d5..872e028 100644
--- a/pkg/de-p1st-xfce4/PKGBUILD
+++ b/pkg/de-p1st-xfce4/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=xfce4
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.13
+pkgver=0.0.14
 pkgrel=1
 pkgdesc="XFCE4 with configuration"
 arch=('any')
@@ -73,15 +73,15 @@ package() {
   # Thus we place it in the skeleton for new users!
 
   # === higher screen resolution in a VM ===
-  install -Dm0644 config/xfce4/xfconf/xfce4-perchannel-xml/displays.xml "$pkgdir"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
-
-
+  # config/xfce4/xfconf/xfce4-perchannel-xml/displays.xml
   # === desktop and workspaces ===
-  install -Dm0644 config/xfce4/xfconf/xfce4-perchannel-xml/xfce4-desktop.xml "$pkgdir"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
-
+  # config/xfce4/xfconf/xfce4-perchannel-xml/xfce4-desktop.xml
   # === panel ===
-  install -Dm0644 config/xfce4/xfconf/xfce4-perchannel-xml/xfce4-panel.xml   "$pkgdir"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
-  install -Dm0644 config/xfce4/panel/launcher-8/16218680691.desktop          "$pkgdir"/etc/skel/.config/xfce4/panel/launcher-8/16218680691.desktop
+  # config/xfce4/xfconf/xfce4-perchannel-xml/xfce4-panel.xml
+  # config/xfce4/panel/launcher-8/16218680691.desktop
+  #
+  mkdir -p "$pkgdir"/etc/skel/
+  cp -ra config "$pkgdir"/etc/skel/.config
 
   # === display manager ===
   install -Dm0644 systemd.preset        "$pkgdir"/usr/lib/systemd/system-preset/20-"$pkgname".preset
diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index daab184..b0327e3 100644
--- a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Changes from default panel configuration:
-     * Add Whisker-Menu to the left; remove Applications Menu from left; remove user from the right;
      * Remove lower panel (panel number 2)
+     * Add Whisker-Menu to the left
+     * Add launcher "screenshot" to the right (this requires the folder .config/xfce4/panel/launcher-8/)
+     * Remove Applications Menu from left; remove user from the right;
 -->
 
 <channel name="xfce4-panel" version="1.0">