diff --git a/plymouth-install-label-library-and-font-file-to-initrd.patch b/plymouth-install-label-library-and-font-file-to-initrd.patch index f86f67a..57c19ea 100644 --- a/plymouth-install-label-library-and-font-file-to-initrd.patch +++ b/plymouth-install-label-library-and-font-file-to-initrd.patch @@ -13,11 +13,11 @@ diff -Nura plymouth-0.9.5+git20201026+53c83cc/scripts/plymouth-populate-initrd.i PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_SYSROOT}${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_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//') -+PLYMOUTH_Font_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^Font *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^Font *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'}) -+PLYMOUTH_TitleFont_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^TitleFont *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^TitleFont *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'}) ++PLYMOUTH_Font_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^Font *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^Font *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'} | sort -u | head -n 1) ++PLYMOUTH_TitleFont_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^TitleFont *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^TitleFont *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'} | sort -u | head -n 1) + -+[ -f ${PLYMOUTH_Font_PATH} ] && inst ${PLYMOUTH_Font_PATH} $INITRDDIR -+[ -f ${PLYMOUTH_TitleFont_PATH} ] && inst ${PLYMOUTH_TitleFont_PATH} $INITRDDIR ++[ -f "${PLYMOUTH_Font_PATH}" ] && inst ${PLYMOUTH_Font_PATH} $INITRDDIR ++[ -f "${PLYMOUTH_TitleFont_PATH}" ] && inst ${PLYMOUTH_TitleFont_PATH} $INITRDDIR if [ ! -f ${PLYMOUTH_SYSROOT}${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" >&2 diff --git a/plymouth.changes b/plymouth.changes index 1da43c6..971f2dc 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 10 22:09:16 UTC 2022 - Dirk Müller + +- update plymouth-install-label-library-and-font-file-to-initrd.patch: + avoid aborting on multiple font path match, pick the first one + ------------------------------------------------------------------- Sun Jan 30 05:12:13 UTC 2022 - Cliff Zhao