diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-06-20 00:17:02 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-06-20 00:17:02 +0000 |
| commit | d4fc584014c27ddc20b47759829caa9715fb50de (patch) | |
| tree | a24fe8bf38bc5d306d9556f6163be3c78f379389 /packaging/macosx/Resources | |
| parent | Correctly write Aleksandar Urosevic's name. Closes 1353260. (diff) | |
| download | inkscape-d4fc584014c27ddc20b47759829caa9715fb50de.tar.gz inkscape-d4fc584014c27ddc20b47759829caa9715fb50de.zip | |
* packaging/macosx/Resources/script,
packaging/macosx/Resources/bin/inkscape:
Improve quoting of shell variables.
* packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj:
Xcode 2 project file for the OS X launcher. This will build a
Universal version of the launcher by default. The project files for
different versions are named differently, so this will be picked up and
used if the package builder has a sufficiently new version of Xcode.
* packaging/macosx/ScriptExec/ScriptExec.xcode/sveinbjornt.pbxuser,
packaging/macosx/ScriptExec/ScriptExec.xcode/voisine.pbxuser:
Remove unnecessary user preference files.
* Makefile.am:
Update the Xcode project files included when creating releases.
(bzr r1239)
Diffstat (limited to 'packaging/macosx/Resources')
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 28 | ||||
| -rwxr-xr-x | packaging/macosx/Resources/script | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index ad8e67454..f26369cf7 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -6,24 +6,24 @@ CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo $PWD)`" TOP="`dirname \"$CWD\"`" -export "DYLD_LIBRARY_PATH=$TOP/lib" -export "PATH=$CWD:$PATH" -export "PANGO_RC_FILE=$HOME/.inkscape-etc/pangorc" -export "FONTCONFIG_PATH=$TOP/etc/fonts" -export "GTK_IM_MODULE_FILE=$HOME/.inkscape-etc/gtk.immodules" -export "GDK_PIXBUF_MODULE_FILE=$HOME/.inkscape-etc/gdk-pixbuf.loaders" -export "GTK_DATA_PREFIX=$TOP" -export "GTK_EXE_PREFIX=$TOP" -export "GNOME_VFS_MODULE_CONFIG_PATH=$TOP/etc/gnome-vfs-2.0/modules" -export "GNOME_VFS_MODULE_PATH=$TOP/lib/gnome-vfs-2.0/modules" +export DYLD_LIBRARY_PATH="$TOP/lib" +export PATH="$CWD:$PATH" +export PANGO_RC_FILE="$HOME/.inkscape-etc/pangorc" +export FONTCONFIG_PATH="$TOP/etc/fonts" +export GTK_IM_MODULE_FILE="$HOME/.inkscape-etc/gtk.immodules" +export GDK_PIXBUF_MODULE_FILE="$HOME/.inkscape-etc/gdk-pixbuf.loaders" +export GTK_DATA_PREFIX="$TOP" +export GTK_EXE_PREFIX="$TOP" +export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" +export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" -export "INKSCAPE_SHAREDIR=$TOP" -export "INKSCAPE_PLUGINDIR=$TOP/lib/inkscape" -export "INKSCAPE_LOCALEDIR=$TOP/locale" +export INKSCAPE_SHAREDIR="$TOP" +export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" +export INKSCAPE_LOCALEDIR="$TOP/locale" # TODO: Have to add ".UTF-8" to the LANG since ommiting causes Inkscape # to crash on startup in locale_from_utf8(). -export "LANG=`grep \"\`defaults read .GlobalPreferences AppleCollationOrder \ +export LANG="`grep \"\`defaults read .GlobalPreferences AppleCollationOrder \ 2>&1\`_\" /usr/share/locale/locale.alias | tail -n1 | sed 's/\./ /' | \ awk '{print $2}'`.UTF-8" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index fb67e950c..a343227c9 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -20,7 +20,7 @@ echo ":0" > /tmp/display.$UID while [ "$?" == "0" -a ! -f /tmp/display.$UID ]; do sleep 1 done -export "DISPLAY=`cat /tmp/display.$UID`" +export DISPLAY="`cat /tmp/display.$UID`" ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11 |