PATCH custom themes in folder on boot

4 files changed, 9 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3aac5828209f..0cc1dfaf2b99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Aug 16 07:10:07 UTC 2017
+# Thu Aug 17 11:09:58 UTC 2017
 pkgbase = plymouth
 	pkgdesc = A graphical boot splash screen with kernel mode-setting support
 	pkgver = 0.9.2
-	pkgrel = 14
+	pkgrel = 15
 	url = http://www.freedesktop.org/wiki/Software/Plymouth/
 	arch = i686
 	arch = x86_64
@@ -49,8 +49,8 @@ pkgbase = plymouth
 	md5sums = 78340207f7391c682601b1b36baed14d
 	md5sums = 672ad913e2383483bcb4599a0a6bee48
 	md5sums = 32f04fdbd1eb94ade30d1e63fdcdd9b5
-	md5sums = c22b22823ea1098448178ef9b0d2c416
-	md5sums = 072c1ad4e2e3f526395489899bb6462c
+	md5sums = c17e915b19a469198a37dd7376a846c7
+	md5sums = af3c3eadc80e240416d11b2d5983dfb5
 	md5sums = 165a39dbedcc6e123c8ca05d5b4b2e25
 	md5sums = f79edbbb30c71b0dbcd102c7dd31660b
 	md5sums = 0357775c16b5f90f1af485e6a4c80a9e
diff --git a/PKGBUILD b/PKGBUILD
index fed545a936e5..04d74851f453 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=plymouth
 pkgver=0.9.2
-pkgrel=14
+pkgrel=15
 pkgdesc="A graphical boot splash screen with kernel mode-setting support"
 url="http://www.freedesktop.org/wiki/Software/Plymouth/"
 
@@ -55,8 +55,8 @@ md5sums=('ff420994deb7ea203df678df92e7ab7d'
          '78340207f7391c682601b1b36baed14d'
          '672ad913e2383483bcb4599a0a6bee48'
          '32f04fdbd1eb94ade30d1e63fdcdd9b5'
-         'c22b22823ea1098448178ef9b0d2c416'
-         '072c1ad4e2e3f526395489899bb6462c'
+         'c17e915b19a469198a37dd7376a846c7'
+         'af3c3eadc80e240416d11b2d5983dfb5'
          '165a39dbedcc6e123c8ca05d5b4b2e25'
          'f79edbbb30c71b0dbcd102c7dd31660b'
          '0357775c16b5f90f1af485e6a4c80a9e')
diff --git a/plymouth.initcpio_install b/plymouth.initcpio_install
index 6fcc953e4713..f437971439ea 100644
--- a/plymouth.initcpio_install
+++ b/plymouth.initcpio_install
@@ -33,10 +33,7 @@ build() {
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
 
 	if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-	    for x in ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/**/* ; do
-		[ ! -f "$x" ] && break
-		add_file $x
-	    done
+            add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
 	fi
 	
 	add_file /usr/lib/udev/rules.d/70-uaccess.rules
diff --git a/sd-plymouth.initcpio_install b/sd-plymouth.initcpio_install
index d26fa7e7f74f..2add5632b3cb 100644
--- a/sd-plymouth.initcpio_install
+++ b/sd-plymouth.initcpio_install
@@ -36,10 +36,7 @@ build() {
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
 
 	if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-		for x in ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/**/* ; do
-			[ ! -f "$x" ] && break
-			add_file $x
-		done
+                add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
 	fi
 	
 	add_udev_rule 70-uaccess.rules