commit 4599a1b6f106a862bd455a9cafac91512bede0fc Author: Stephan Witt <sw...@lyx.org> Date: Thu Sep 14 08:52:38 2017 +0200
#10762 correct user preferences file lookup (cherry picked from commit 4939741a737223a7b4bafad5bb00122f658fafea) --- development/MacOSX/lyxeditor | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/development/MacOSX/lyxeditor b/development/MacOSX/lyxeditor index d08cdd2..553acb0 100755 --- a/development/MacOSX/lyxeditor +++ b/development/MacOSX/lyxeditor @@ -39,8 +39,8 @@ test -d "${USER_SUPPORT}" || { exit 1 } -# 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* +# we prefer newer lyx releases here... +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 ABS_USER_LYXDIR="${USER_SUPPORT}/${LYXDIR}" test -d "${ABS_USER_LYXDIR}" || { @@ -53,9 +53,9 @@ do } # preferences file exists. # 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}") + # break if pipe entry and pipe detected + # hopefully it's the correct LyX instance... if [ -n "$LYXPIPE" -a -p "$LYXPIPE".in ]; then break fi