From ecace5d12547c14841603a431a4e955edec58681 Mon Sep 17 00:00:00 2001 From: Peter Moulder Date: Sun, 30 Mar 2008 12:34:46 +0000 Subject: =?UTF-8?q?Untested:=20packaging/macosx/Resources/script:=20Improv?= =?UTF-8?q?e=20[notwithstanding=20untestedness]=20quoting.=20=20Note=20tha?= =?UTF-8?q?t=20one=20change=20is=20that=20the=20new=20version=20uses=20?= =?UTF-8?q?=E2=80=98/home/pmoulder=E2=80=99=20in=20.xinitrc=20where=20the?= =?UTF-8?q?=20previous=20version=20used=20=E2=80=98/home/jrl=E2=80=99=20or?= =?UTF-8?q?=20whatever.=20Add=20FIXME=20comment=20about=20insecure=20/tmp?= =?UTF-8?q?=20file.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (bzr r5235) --- packaging/macosx/Resources/script | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index ec3861f4d..e6b7b224d 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -3,7 +3,7 @@ # Author: Aaron Voisine # Inkscape Modifications: Michael Wybrow -CWD="`dirname \"$0\"`" +CWD=`dirname "$0"` # System version: 3 for Panther, 4 for Tiger, 5 for Leopard export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` @@ -18,12 +18,13 @@ if [[ $VERSION -le 4 ]]; then # from xinitrc but when is it really used? Should we modify # the .xinitrc of the user without warning? ps -wx -ocommand | grep -e '[X]11' > /dev/null - if [ "$?" != "0" -a ! -f ${HOME}/.xinitrc ]; then - echo "rm -f ${HOME}/.xinitrc" > ${HOME}/.xinitrc - sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ${HOME}/.xinitrc + if [ "$?" != "0" -a ! -f "${HOME}/.xinitrc" ]; then + echo "rm -f \"\${HOME}/.xinitrc\"" > "${HOME}/.xinitrc" + sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> "${HOME}/.xinitrc" fi # Start X11 and get DISPLAY + # FIXME: Insecure tmp file usage. Why do we have to copy this to /tmp anyway? cp -f "$CWD/bin/getdisplay.sh" /tmp/ rm -f /tmp/display.$UID open-x11 /tmp/getdisplay.sh || \ @@ -33,7 +34,7 @@ if [[ $VERSION -le 4 ]]; then 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 @@ -48,11 +49,11 @@ fi -BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'`" +BASE=`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'` cd "$BASE" exec "$CWD/bin/inkscape" "$@" -# TODO examine wether it would be wisest to move the code from inkscape shell +# TODO examine whether it would be wisest to move the code from inkscape shell # script and getdisplay.sh to here and only keep the real binary in bin. This # may make things easier on Leopard and may also help using Inkscape on the -# command line +# command line. -- cgit v1.2.3