From c54b535c23fd6fd73286183b39a1ebe5886d206d Mon Sep 17 00:00:00 2001 From: mjwybrow Date: Thu, 23 Mar 2006 03:42:26 +0000 Subject: [PATCH] * packaging/macosx/Resources/bin/inkscape: Fix a packaging problem on Mac OSX where Inkscape wouldn't open if one of the parent directories containing the app bundle contained a '#' in its name. Fixes bug #1443072. --- ChangeLog | 7 +++++++ packaging/macosx/Resources/bin/inkscape | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f7c143a69..f65651c8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-23 Michael Wybrow + + * packaging/macosx/Resources/bin/inkscape: Fix a packaging + problem on Mac OSX where Inkscape wouldn't open if one of the + parent directories containing the app bundle contained a '#' in + its name. Fixes bug #1443072. + 2006-03-15 Michael Wybrow * share/icons/Makefile.am: Update a makefile after the icon file diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index bcfa77662..ad8e67454 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -27,9 +27,13 @@ export "LANG=`grep \"\`defaults read .GlobalPreferences AppleCollationOrder \ 2>&1\`_\" /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | \ awk '{print $2}'`.UTF-8" +# Handle the case where the directory storing Inkscape has a '#' in the name. +# This '#' needs to be escaped in pango.modules for Pango to work properly. +ESCAPEDTOP=`echo $TOP | sed 's/#/\\\\\\\\#/'` + mkdir -p ~/.inkscape-etc sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > ~/.inkscape-etc/pangorc -sed 's|${CWD}|'"$TOP|g" "$TOP/etc/pango/pango.modules" \ +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ > ~/.inkscape-etc/pango.modules cp -f "$TOP/etc/pango/pangox.aliases" ~/.inkscape-etc/ sed 's|${CWD}|'"$TOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ -- 2.30.2