* 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.

diff --git a/ChangeLog b/ChangeLog
index f7c143a69331de846addf346ad1116bf4452e7d6..f65651c8c20a3f4da23dd07e3d5eb08dfdb3ab7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-23  Michael Wybrow  <mjwybrow@users.sourceforge.net>
+
+       * 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  <mjwybrow@users.sourceforge.net>
 
        * 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 bcfa77662a5b59a0c8e2fa8ebfcb59dec2f6f2f5..ad8e67454cb46c3d9890e6b29ffc17424ee347ea 100755 (executable)
--- 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" \