Merge branch 'spinner-bgrt-theme-update' into 'master'

Spinner bgrt theme update

See merge request plymouth/plymouth!22

scripts/plymouth-populate-initrd.in

@@ -412,6 +412,8 @@ if [ $THEME_OVERRIDE ]; then
 fi
 
 PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
+PLYMOUTH_THEME_DIR="${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}"
+PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
 
 if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
     echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" >&2
@@ -423,8 +425,12 @@ inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
 [ -f "${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so" ] && inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR
 inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR
 
-if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-     inst_recur "${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}"
+if [ -d "${PLYMOUTH_THEME_DIR}" ]; then
+     inst_recur "${PLYMOUTH_THEME_DIR}"
+fi
+
+if [ "${PLYMOUTH_IMAGE_DIR}" != "${PLYMOUTH_THEME_DIR}" -a -d "${PLYMOUTH_IMAGE_DIR}" ]; then
+     inst_recur "${PLYMOUTH_IMAGE_DIR}"
 fi
 
 if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then

themes/bgrt/Makefile.am

@@ -1,79 +1,6 @@
 themedir = $(datadir)/plymouth/themes/bgrt
 nodist_theme_DATA = bgrt.plymouth
 
-dist_theme_DATA =                                                     \
-                    background-tile.png                               \
-                    box.png                                           \
-                    bullet.png                                        \
-                    entry.png                                         \
-                    lock.png                                          \
-                    animation-0001.png                                \
-                    animation-0002.png                                \
-                    animation-0003.png                                \
-                    animation-0004.png                                \
-                    animation-0005.png                                \
-                    animation-0006.png                                \
-                    animation-0007.png                                \
-                    animation-0008.png                                \
-                    animation-0009.png                                \
-                    animation-0010.png                                \
-                    animation-0011.png                                \
-                    animation-0012.png                                \
-                    animation-0013.png                                \
-                    animation-0014.png                                \
-                    animation-0015.png                                \
-                    animation-0016.png                                \
-                    animation-0017.png                                \
-                    animation-0018.png                                \
-                    animation-0019.png                                \
-                    animation-0020.png                                \
-                    animation-0021.png                                \
-                    animation-0022.png                                \
-                    animation-0023.png                                \
-                    animation-0024.png                                \
-                    animation-0025.png                                \
-                    animation-0026.png                                \
-                    animation-0027.png                                \
-                    animation-0028.png                                \
-                    animation-0029.png                                \
-                    animation-0030.png                                \
-                    animation-0031.png                                \
-                    animation-0032.png                                \
-                    animation-0033.png                                \
-                    animation-0034.png                                \
-                    animation-0035.png                                \
-                    animation-0036.png                                \
-                    throbber-0001.png                                 \
-                    throbber-0002.png                                 \
-                    throbber-0003.png                                 \
-                    throbber-0004.png                                 \
-                    throbber-0005.png                                 \
-                    throbber-0006.png                                 \
-                    throbber-0007.png                                 \
-                    throbber-0008.png                                 \
-                    throbber-0009.png                                 \
-                    throbber-0010.png                                 \
-                    throbber-0011.png                                 \
-                    throbber-0012.png                                 \
-                    throbber-0013.png                                 \
-                    throbber-0014.png                                 \
-                    throbber-0015.png                                 \
-                    throbber-0016.png                                 \
-                    throbber-0017.png                                 \
-                    throbber-0018.png                                 \
-                    throbber-0019.png                                 \
-                    throbber-0020.png                                 \
-                    throbber-0021.png                                 \
-                    throbber-0022.png                                 \
-                    throbber-0023.png                                 \
-                    throbber-0024.png                                 \
-                    throbber-0025.png                                 \
-                    throbber-0026.png                                 \
-                    throbber-0027.png                                 \
-                    throbber-0028.png                                 \
-                    throbber-0029.png                                 \
-                    throbber-0030.png
-
 MAINTAINERCLEANFILES = Makefile.in bgrt.plymouth
 CLEANFILES = bgrt.plymouth
 

themes/bgrt/bgrt.plymouth.in

@@ -4,7 +4,7 @@ Description=Jimmac's spinner theme using the ACPI BGRT graphics as background
 ModuleName=two-step
 
 [two-step]
-ImageDir=@PLYMOUTH_THEME_PATH@/bgrt
+ImageDir=@PLYMOUTH_THEME_PATH@/spinner
 HorizontalAlignment=.5
 VerticalAlignment=.75
 WatermarkHorizontalAlignment=.5

themes/spinner/Makefile.am

@@ -3,7 +3,6 @@ nodist_theme_DATA = spinner.plymouth
 
 dist_theme_DATA =                                                     \
                     background-tile.png                               \
-                    box.png                                           \
                     bullet.png                                        \
                     entry.png                                         \
                     lock.png                                          \

themes/spinner/spinner.plymouth.in

@@ -7,6 +7,8 @@ ModuleName=two-step
 ImageDir=@PLYMOUTH_THEME_PATH@/spinner
 HorizontalAlignment=.5
 VerticalAlignment=.75
+WatermarkHorizontalAlignment=.5
+WatermarkVerticalAlignment=.96
 Transition=none
 TransitionDuration=0.0
 BackgroundStartColor=0x202020