Include session files in session package instead of shell theme package.

Delete empty directories from packages

2 files changed, 9 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2220d3c16254..7c2dfbc1586b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = yaru-git
 	pkgdesc = Yaru default ubuntu theme
-	pkgver = 19.10.4.r25.g00aaee95
-	pkgrel = 1
+	pkgver = 19.10.4.r34.g2d2cf90a
+	pkgrel = 2
 	url = https://github.com/ubuntu/yaru
 	arch = any
 	license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 2d17437b364a..ac3ca2b85097 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=(yaru-sound-theme-git
          yaru-gnome-shell-theme-git
          yaru-icon-theme-git
          yaru-session-git)
-pkgver=19.10.4.r25.g00aaee95
-pkgrel=1
+pkgver=19.10.4.r34.g2d2cf90a
+pkgrel=2
 pkgdesc="Yaru default ubuntu theme"
 arch=(any)
 url="https://github.com/ubuntu/yaru"
@@ -37,14 +37,16 @@ _delete_all_from_pkgdir_except() {
         rm -r "${pkgdir}"/usr/share/themes/Yaru{-light,{,-dark}/{gtk-*,index.theme}}
     fi
     if [[ "$1" != "gnome-shell-theme" ]]; then
-        rm -r "${pkgdir}"/usr/share/{gnome-shell,themes/Yaru{,-dark}/gnome-shell}
+        rm -r "${pkgdir}"/usr/share/themes/Yaru{,-dark}/gnome-shell
     fi
     if [[ "$1" != "icon-theme" ]]; then
         rm -r "${pkgdir}"/usr/share/icons
     fi
     if [[ "$1" != "session" ]]; then
-        rm -r "${pkgdir}"/usr/share/{glib-2.0,xsessions,wayland-sessions}
+        rm -r "${pkgdir}"/usr/share/{gnome-shell,glib-2.0,xsessions,wayland-sessions}
     fi
+    # Delete remaining empty directories:
+    find "${pkgdir}" -type d -empty -delete
 }
 
 package_yaru-sound-theme-git() {
@@ -94,4 +96,4 @@ package_yaru-session-git() {
 
     DESTDIR="$pkgdir" ninja -C build install 2>&1 >> install.log
     _delete_all_from_pkgdir_except "session"
-}
\ No newline at end of file
+}