From: Bruce Jerrick <bmj001@gmail.com>
Date: Tue, 6 Jul 2010 15:13:38 +0000 (-0400)
Subject: [set-default-theme] Properly quote arguments to basename
X-Git-Tag: 0.8.4~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95bf9eed86b4bf267bcd77774ee37c08dc5b9162;p=thirdparty%2Fplymouth.git

[set-default-theme] Properly quote arguments to basename

It's important to make sure the theme name is properly
quoted when passed to the basename command.  This
is because, if the theme name is empty we want the empty
string returned, not the suffix that would otherwise be
stripped off.

Some discussion here:
https://bugzilla.redhat.com/show_bug.cgi?id=606634
---

diff --git a/scripts/plymouth-set-default-theme.in b/scripts/plymouth-set-default-theme.in
index 105cdd80..d9b0f016 100755
--- a/scripts/plymouth-set-default-theme.in
+++ b/scripts/plymouth-set-default-theme.in
@@ -38,7 +38,7 @@ function list_themes ()
 {
         for theme in ${PLYMOUTH_DATADIR}/plymouth/themes/*/*.plymouth; do
                 [ -f $theme ] || continue;
-                echo "$(basename $theme .plymouth)"
+                echo "$(basename "$theme" .plymouth)"
         done
 }
 
@@ -65,7 +65,7 @@ function get_default_theme ()
 
         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)
+                THEME_NAME=$(basename "$(readlink ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth)" .plymouth)
         fi
         if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then
                 THEME_NAME="text"