anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check for presence of pipe, care for LyX-2.0 user dir

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35018 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2010-07-27 19:37:35 +00:00
parent 6d474927ae
commit 2d776b0de1
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
development/MacOSX/lyxeditor
View File

@ -29,9 +29,7 @@ s@^~/@${HOME}/@
p p
q q
}' "$1"` }' "$1"`
echo "${LYXPIPE}" echo "${LYXPIPE}"
unset LYXPIPE
} }
@ -41,11 +39,11 @@ test -d "${USER_SUPPORT}" || {
exit 1 exit 1
} }
for LYXDIR in LyX-2.0 LyX-1.6 LyX-1.5 LyX-1.4 LyX # we prefere newer lyx releases here... the last should catch all
for LYXDIR in LyX-2.0* LyX-2* LyX-1.6* LyX-1.5* LyX-1.4* LyX*
do do
ABS_USER_LYXDIR="${USER_SUPPORT}/${LYXDIR}" ABS_USER_LYXDIR="${USER_SUPPORT}/${LYXDIR}"
test -d "${ABS_USER_LYXDIR}" || { test -d "${ABS_USER_LYXDIR}" || {
echo "Failed to find ABS_USER_LYXDIR: ${ABS_USER_LYXDIR}" >&2
continue continue
} }
PREFERENCES="${ABS_USER_LYXDIR}/preferences" PREFERENCES="${ABS_USER_LYXDIR}/preferences"
@ -58,10 +56,12 @@ do
# Whether it does or not, break out of the loop because we've # Whether it does or not, break out of the loop because we've
# found the preferences file. # found the preferences file.
LYXPIPE=`parse_serverpipe "${PREFERENCES}"` LYXPIPE=`parse_serverpipe "${PREFERENCES}"`
if [ -n "$LYXPIPE" -a -p "$LYXPIPE".in ]; then
break break
fi
done done
echo "preferences file sets lyxpipe as ${LYXPIPE}" # echo "preferences file sets lyxpipe as ${LYXPIPE}"
test -z "${LYXPIPE}" && { test -z "${LYXPIPE}" && {
ABS_SYSTEM_LYXDIR='/Applications/LyX.app/Contents/Resources' ABS_SYSTEM_LYXDIR='/Applications/LyX.app/Contents/Resources'
@ -80,13 +80,17 @@ test -z "${LYXPIPE}" && {
LYXPIPE=`parse_serverpipe "${LYXRC_DIST}"` LYXPIPE=`parse_serverpipe "${LYXRC_DIST}"`
} }
echo "Our best guess sets lyxpipe as ${LYXPIPE}" if [ -n "$LYXPIPE" -a -p "$LYXPIPE".in ]; then
# The end
file=`echo "$1" | sed 's|^/private||'` file=`echo "$1" | sed 's|^/private||'`
MAC_LYXPIPE_CONTENTS="LYXCMD:macdvix:server-goto-file-row:$file $2" MAC_LYXPIPE_CONTENTS="LYXCMD:macdvix:server-goto-file-row:$file $2"
echo "$MAC_LYXPIPE_CONTENTS" # echo "$MAC_LYXPIPE_CONTENTS"
echo "$MAC_LYXPIPE_CONTENTS" > "${LYXPIPE}".in || exit echo "$MAC_LYXPIPE_CONTENTS" > "${LYXPIPE}".in || { echo "Cannot write to lyxpipe." ; exit 2 ; }
read < "${LYXPIPE}".out || exit read < "${LYXPIPE}".out || { echo "Cannot read from lyxpipe." ; exit 2 ; }
else
echo "Our best guess sets lyxpipe as ${LYXPIPE}"
echo "But the lyxpipe could not be found."
exit 1
fi
# The end