anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#10762 correct user preferences file lookup

Browse Source 
(cherry picked from commit 4939741a73)
This commit is contained in:
Stephan Witt 2017-09-14 08:52:38 +02:00
parent 024c9d315b
commit 4599a1b6f1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
development/MacOSX/lyxeditor
View File

@ -39,8 +39,8 @@ test -d "${USER_SUPPORT}" || {
exit 1 exit 1
} }
# we prefere newer lyx releases here... the last should catch all # we prefer newer lyx releases here...
for LYXDIR in LyX-2.0* LyX-2* LyX-1.6* LyX-1.5* LyX-1.4* LyX* for LYXDIR in LyX-2.4 LyX-2.3 LyX-2.2 LyX-2.1 LyX-2.0 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}" || {
@ -53,9 +53,9 @@ do
} }
# preferences file exists. # preferences file exists.
# See if it contains a \\serverpipe entry # See if it contains a \\serverpipe entry
# Whether it does or not, break out of the loop because we've
# found the preferences file.
LYXPIPE=$(parse_serverpipe "${PREFERENCES}") LYXPIPE=$(parse_serverpipe "${PREFERENCES}")
# break if pipe entry and pipe detected
# hopefully it's the correct LyX instance...
if [ -n "$LYXPIPE" -a -p "$LYXPIPE".in ]; then if [ -n "$LYXPIPE" -a -p "$LYXPIPE".in ]; then
break break
fi fi