diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-03-23 03:42:26 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-03-23 03:42:26 +0000 |
| commit | d738c7442de09046c4860db0df634e4cc20f5020 (patch) | |
| tree | 928b84649181ee774b926d0a14100dc36d1da0a1 | |
| parent | remove confusing decimal digits in the number of scans (diff) | |
| download | inkscape-d738c7442de09046c4860db0df634e4cc20f5020.tar.gz inkscape-d738c7442de09046c4860db0df634e4cc20f5020.zip | |
* 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.
(bzr r276)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 6 |
2 files changed, 12 insertions, 1 deletions
@@ -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 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" \ |