[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
This commit is contained in:
Bruce Jerrick 2010-07-06 11:13:38 -04:00 committed by Ray Strode
parent 0e232e2976
commit 95bf9eed86

View file

@ -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"