Handle filenames with embedded spaces.

This patch has been submitted upstream:

    http://code.google.com/p/tovid/issues/detail?id=138
This commit is contained in:
Brian Somers 2010-12-02 10:01:46 +00:00
parent e2c8af6ff6
commit 421b637431
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=265563

View file

@ -0,0 +1,29 @@
--- src/makemenu.orig 2010-12-02 01:51:23.000000000 -0800
+++ src/makemenu 2010-12-02 01:53:50.000000000 -0800
@@ -563,7 +563,7 @@
# Blank placeholder: no font decorations or color
convert \
- -size $(identify "$TMP_DIR/00_title-$SEQNUM.png" | awk '{print $3}') \
+ -size $(identify - <"$TMP_DIR/00_title-$SEQNUM.png" | awk '{print $3}') \
xc:none "$TMP_DIR/00_title-${SEQNUM}_placeholder.png"
fi
done
@@ -600,7 +600,7 @@
"$TILE_CANVAS" "$SELECT_BUTTON"
# A placeholder to space the title text correctly
- convert -size $(identify "$HIGHLIGHT_BUTTON" | awk '{print $3}') xc:none \
+ convert -size $(identify - <"$HIGHLIGHT_BUTTON" | awk '{print $3}') xc:none \
"$BUTTON_PLACEHOLDER"
# Next, join the button tiles with the title tiles:
@@ -654,7 +654,7 @@
"$MENU_TEXT"
if test $RES = "dvd"; then
# DVD menus need an empty placeholder for the buttons
- convert -size $(identify "$MENU_TITLE_TEXT" | awk '{print $3}') \
+ convert -size $(identify - <"$MENU_TITLE_TEXT" | awk '{print $3}') \
xc:none "$MENU_TITLE_PLACEHOLDER"
convert -background none "$MENU_TITLE_PLACEHOLDER" "$HIGHLIGHT_TEXT" \
-append "$HIGHLIGHT_TEXT"