From: Ray Strode <rstrode@redhat.com>
Date: Fri, 14 May 2010 14:56:00 +0000 (-0400)
Subject: [set-default-theme] More fixes to the fallback logic
X-Git-Tag: 0.8.4~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=070d2a0a5ad746046ef15065a4fa654cd22906e5;p=thirdparty%2Fplymouth.git

[set-default-theme] More fixes to the fallback logic

It still wasn't properly falling back in the event the
configured theme was uninstalled.
---

diff --git a/scripts/plymouth-set-default-theme.in b/scripts/plymouth-set-default-theme.in
index 46312466..105cdd80 100755
--- a/scripts/plymouth-set-default-theme.in
+++ b/scripts/plymouth-set-default-theme.in
@@ -63,10 +63,11 @@ function get_default_theme ()
                 THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_POLICYDIR}/plymouthd.defaults)
         fi
 
-        if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then
+        if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" \
+             -a -L "${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth" ]; then
                 THEME_NAME=$(basename $(readlink ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth) .plymouth)
         fi
-        if [ -z "$THEME_NAME" ]; then
+        if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then
                 THEME_NAME="text"
         fi